Merge pull request #10 from 2000me/setting-storage

Setting storage
2000me · Apr 12, 2020 · ff96b1e · ff96b1e
2 parents 6293f23 + 182aad9
commit ff96b1e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 20 deletions.
diff --git a/js/b.js b/js/b.js
@@ -74,11 +74,13 @@ function pollReport(responseJson, reportUrl, i) {
         var id = responseJson.scan_id.substring(0, 64);
         if (id.match(/^[0-9a-f]{64}$/)) {
             var pUrl = DETECTION_URL_PREFIX + id + DETECTION_URL_SUFFIX
-            if (localStorage.getItem("TabOrWindow") == "w") {
-                browser.windows.create({url: pUrl});
-            } else {
-                browser.tabs.create({url: pUrl});
-            }
+            browser.storage.local.get("TabOrWindow").then(result => {
+                if (result.TabOrWindow == "t") {
+                    browser.tabs.create({url: pUrl});
+                } else {
+                    browser.windows.create({url: pUrl});
+                }
+            })
         } else {
             notifyUsingBasicNotification(
                 browser.i18n.getMessage('notifyUnexpectedResponse')
@@ -121,6 +123,13 @@ browser.contextMenus.onClicked.addListener((info, tab) => {
 	}
 });
 
-if (localStorage.getItem("TabOrWindow") == null) {
-  localStorage.setItem("TabOrWindow", "w");
-};
+browser.storage.local.get("TabOrWindow").then(result => {
+    if (typeof result.TabOrWindow === "undefined") {
+        if (localStorage.getItem("TabOrWindow") != null) {
+            browser.storage.local.set({"TabOrWindow": localStorage.getItem("TabOrWindow")});
+            localStorage.removeItem("TabOrWindow");
+        } else {
+            browser.storage.local.set({"TabOrWindow": "w"});
+        }
+    }
+});
diff --git a/js/options.js b/js/options.js
@@ -1,16 +1,30 @@
-if (localStorage.getItem("TabOrWindow") == null) {
-  localStorage.setItem("TabOrWindow", "w");
-}
-
-if (localStorage.getItem("TabOrWindow") == "w") {
-  document.getElementById("optionWindow").checked = true;
-} else {
-  document.getElementById("optionTab").checked = true;
-}
+browser.storage.local.get("TabOrWindow").then(result => {
+    if (typeof result.TabOrWindow === "undefined") {
+        if (localStorage.getItem("TabOrWindow") != null) {
+            if (localStorage.getItem("TabOrWindow") == "t") {
+                document.getElementById("optionTab").checked = true;
+            } else {
+                document.getElementById("optionWindow").checked = true;
+            }
+            browser.storage.local.set({"TabOrWindow": localStorage.getItem("TabOrWindow")});
+            localStorage.removeItem("TabOrWindow");
+        } else {
+            browser.storage.local.set({"TabOrWindow": "w"});
+            document.getElementById("optionWindow").checked = true;
+        }
+    } else {
+        if (result.TabOrWindow == "t") {
+          document.getElementById("optionTab").checked = true;
+        } else {
+          document.getElementById("optionWindow").checked = true;
+        }
+    }
+});
 
 document.getElementById("optionTab").addEventListener("click", function(){
-  localStorage.setItem("TabOrWindow", "t");
+  browser.storage.local.set({"TabOrWindow": "t"});
 });
+
 document.getElementById("optionWindow").addEventListener("click", function(){
-  localStorage.setItem("TabOrWindow", "w");
+  browser.storage.local.set({"TabOrWindow": "w"});
 });
diff --git a/manifest.json b/manifest.json
@@ -21,5 +21,5 @@
         "storage",
         "https://www.virustotal.com/*"
     ],
-    "version": "0.6.2"
+    "version": "0.6.3"
 }