Merge pull request #22 from victorquinn/master

Fix bug causing crash if localStorage not available
tsironis · Dec 9, 2015 · 4e9af2d · 4e9af2d
2 parents 428a752 + 514832f
commit 4e9af2d
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lockr.js b/lockr.js
@@ -67,11 +67,15 @@
     try {
       value = JSON.parse(localStorage.getItem(query_key));
     } catch (e) {
-      if( localStorage[query_key] ){
-        value = JSON.parse('{"data":"' + localStorage.getItem(query_key) + '"}')
-      }else{
-        value = null;
-      }
+        try {
+            if(localStorage[query_key]) {
+                value = JSON.parse('{"data":"' + localStorage.getItem(query_key) + '"}');
+            } else{
+                value = null;
+            }
+        } catch (e) {
+            if (console) console.warn("Lockr could not load the item with key " + key);
+        }
     }
     if(value === null) {
       return missing;