Merge branch 'master' into loader-suffix

Author: alexsb

dataLoading.js

@@ -357,7 +357,7 @@ function parseDataSet(data, dataSetDescription) {
     for (var i = 0; i < rawSets.length; i++) {
         var combinedSets = Array.apply(null, new Array(rawSets.length)).map(Number.prototype.valueOf, 0);
         combinedSets[i] = 1;
-        var set = new Set(setPrefix + i, setNames[i], combinedSets, rawSets[i]);
+        var set = new USet(setPrefix + i, setNames[i], combinedSets, rawSets[i]);
         setIdToSet[setPrefix + i] = set;
         sets.push(set);
         if (i < nrDefaultSets) {

dataStructure.js

@@ -142,7 +142,7 @@ function BaseSet(setID, setName, combinedSets, setData, fake) {
 BaseSet.prototype = Element;
 BaseSet.prototype.constructor = Element;
 
-function Set(setID, setName, combinedSets, itemList) {
+function USet(setID, setName, combinedSets, itemList) {
     BaseSet.call(this, setID, setName, combinedSets,[],1);
         for (var i = 0; i < itemList.length; i++) {
         if (itemList[i] !== 0) {
@@ -159,8 +159,8 @@ function Set(setID, setName, combinedSets, itemList) {
 
 }
 
-Set.prototype = BaseSet;
-Set.prototype.constructor = BaseSet;
+USet.prototype = BaseSet;
+USet.prototype.constructor = BaseSet;
 
 function SubSet(setID, setName, combinedSets, itemList, expectedProb) {
     BaseSet.call(this, setID, setName, combinedSets, itemList);
@@ -184,7 +184,7 @@ SubSet.prototype.toString = function () {
 }
 
 // Not sure how to do this properly with parameters?
-SubSet.prototype = Set;
+SubSet.prototype = USet;
 SubSet.prototype.constructor = SubSet;
 
 function Group(groupID, groupName, level) {

google5b563563e3374b43.html

@@ -6,7 +6,7 @@
   <script src="google-analytics.js"></script>
   <script src="lib/d3.v3.js" charset="utf-8"></script>
   <script src="lib/colorbrewer.js" charset="utf-8"></script>
-  <script src="https://code.jquery.com/jquery-2.1.0.min.js"></script>
+  <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script>
   <link rel="stylesheet" type="text/css" href="css/html_styles.css">
   <link rel="stylesheet" type="text/css" href="css/set_view.css">
   <link rel="stylesheet" type="text/css" href="css/element_view.css">

index.html

@@ -29,6 +29,6 @@
     "d3": "^3.5.14",
     "font-awesome": "^4.4.0",
     "font-awesome-webpack": "^0.0.5-beta.2",
-    "jquery": "^2.2.0"
+    "jquery": "^3.4.1"
   }
 }

package.json

@@ -2535,7 +2535,7 @@ function UpSet(datasets) {
 
     }
 
-    document.getElementById('rowSizeValue').addEventListener('changeDataset', function () {
+    document.getElementById('rowSizeValue').addEventListener('change', function () {
         ctx.cellDistance = +(document.getElementById('rowSizeValue').value);
         rowTransition();
     });