Merge pull request #42 from VALIDproject/feature_updateDataOnChange

do not load parsed data from localstorage (workaround for #41)
VALIDproject · Aug 6, 2018 · 9af9c0b · 9af9c0b
2 parents 3c71066 + 8ea8272
commit 9af9c0b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/app/data.js b/app/data.js
@@ -1,22 +1,22 @@
 /**
- * This module is responsible for initializing the data. 
- * 1) if a local storage is available it is used. 
+ * This module is responsible for initializing the data.
+ * 1) if a local storage is available it is used.
  * 2) also the combined objects from a previous session is restored.
- */ 
+ */
 
 exports.init = function(rawData)
 {
   hasLocalStorage = typeof(Storage) !== "undefined";
-  if(hasLocalStorage) {
-    data = JSON.parse(localStorage.getItem("data"));
-    if(data == null) {
-      data = require('dataparse').parse(rawData);
-      localStorage.setItem("data",JSON.stringify(data));
-    }
-  }
-  else {
+  // if(hasLocalStorage) {
+  //   data = JSON.parse(localStorage.getItem("data"));
+  //   if(data == null) {
+  //     data = require('dataparse').parse(rawData);
+  //     localStorage.setItem("data",JSON.stringify(data));
+  //   }
+  // }
+  // else {
     data = require('dataparse').parse(rawData);
-  }
+  // }
   nodes = data[0];
   links = data[1];
   ndxLinks = crossfilter(links);
@@ -27,13 +27,13 @@ exports.init = function(rawData)
   targetRestId = nodes.length;
   nodes.push({name:"Sonstige Medien",gov:0});
 
-  if(hasLocalStorage) {
-    combinedObj = JSON.parse(localStorage.getItem("combinedObj"));
-    if(combinedObj == null) {
-      combinedObj = new Array();
-    }
-  }
-  else{
+  // if(hasLocalStorage) {
+  //   combinedObj = JSON.parse(localStorage.getItem("combinedObj"));
+  //   if(combinedObj == null) {
+  //     combinedObj = new Array();
+  //   }
+  // }
+  // else{
     combinedObj = new Array();
-  }
-};
+  // }
+};
diff --git a/app/globalFunctions.js b/app/globalFunctions.js
@@ -200,8 +200,8 @@ deleteData = function(dimension)
       type: "remove"
     });
 
-    if(hasLocalStorage)
-      localStorage.setItem("combinedObj",JSON.stringify(combinedObj));
+    // if(hasLocalStorage)
+    //   localStorage.setItem("combinedObj",JSON.stringify(combinedObj));
 
     updateAll();
   }
@@ -258,8 +258,8 @@ combineData = function(dimension)
       type: "combine"
     });
 
-    if(hasLocalStorage)
-      localStorage.setItem("combinedObj",JSON.stringify(combinedObj));
+    // if(hasLocalStorage)
+    //   localStorage.setItem("combinedObj",JSON.stringify(combinedObj));
 
     updateAll();
   }