Revert "Updated for manifest version 2"

This reverts commit 0a6881a.
ajar · Apr 7, 2013 · 0f92c72 · 0f92c72
1 parent 0a6881a
commit 0f92c72
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 51 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/src/.DS_Store b/src/.DS_Store
diff --git a/src/css/manage.css b/src/css/manage.css
diff --git a/src/html/background.html b/src/html/background.html
@@ -0,0 +1,3 @@
+<html>
+    <script src="../js/background.js"></script>
+</html>
diff --git a/src/html/manage.html b/src/html/manage.html
diff --git a/src/img/icon128.png b/src/img/icon128.png
diff --git a/src/img/icon48.png b/src/img/icon48.png
diff --git a/src/img/logo.png b/src/img/logo.png
diff --git a/src/js/.DS_Store b/src/js/.DS_Store
diff --git a/src/js/background.js b/src/js/background.js
diff --git a/src/js/log.js b/src/js/log.js
@@ -55,30 +55,21 @@ function monitorKeystrokes() {
     var passcode; // extension passcode
     var progress = 0; // characters of passcode matched
 
-    // request passcode from local storage
-    chrome.storage.local.get('passcode', function(response) {
-      if (response.passcode) {
-        passcode = response.passcode.toUpperCase();
-      } else {
-        chrome.storage.local.set({'passcode': 'gselog'}, function() {
-          passcode = 'GSELOG';
-        });
-      }
-    });
-
-    chrome.storage.onChanged.addListener(function(changes, namespace) {
-      for (key in changes) {
-        if (key == 'passcode') 
-          passcode = changes[key].newValue.toUpperCase();
-      }
+    // request passcode from localStorage
+    chrome.extension.sendRequest({action: 'getPasscode'}, function(response) {
+        passcode = response.toUpperCase();
     });
 
     window.addEventListener('keydown', function(event) {
+
         // compare input with expected charCode
         if (event.which == passcode.charCodeAt(progress)) {
+
             if (progress == passcode.length - 1) {
+
                 // request to open the `manage` page
                 chrome.extension.sendRequest({action: 'openManage'});
+
             } else {
                 progress++;
                 return true;

diff --git a/src/js/manage.js b/src/js/manage.js
@@ -1,5 +1,4 @@
 var timeout;
-var passcode;
 
 window.onload = function() {
 
@@ -15,24 +14,19 @@ window.onload = function() {
         // confirm deletion
         if (counter.innerHTML > 0 && confirm('Delete ' + counter.innerHTML +
             ' record(s)? Severely permanent, mind you.')) {
+
             queryRecords('delete');
         }
     });
 
-    // get passcode
-    chrome.storage.local.get('passcode', function(response) {
-      console.log(response)
-      passcode = response.passcode
-    });
-
-    // change passcode
+    // change extension passcode
     passcodeBtn.addEventListener('click', function() {
-        var p = prompt('Enter a passcode (minimum 4 characters):', passcode);
-        if (p && p.length >= 4) {
-          chrome.storage.local.set({'passcode': p}, function() {
-            passcode = p;
-          });
-        }
+
+        var p = prompt('Enter a passcode (minimum 4 characters):',
+            localStorage['passcode']);
+
+        if (p && p.length >= 4)
+            localStorage['passcode'] = p;
     });
 
     // toggle an extraordinarily shameless plug

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,23 +1,18 @@
 {
-	"manifest_version": 2,
-	"name": "Gumshoe",
-	"version": "2.1",
-	"description": "Discreetly records login data to local storage.",
-	"icons": {
-		"128": "img/icon128.png",
-		"48": "img/icon48.png"
-	},
-	"permissions": [
-		"tabs",
-		"storage"
-	],
-	"background": {
-		"scripts": ["js/background.js"]
-	},
-	"content_scripts": [
-		{
-			"matches": ["<all_urls>"],
-			"js": ["js/log.js"]
-		}
-	]
+    "manifest_version": 2,
+    "name": "Gumshoe",
+    "version": "2.0",
+    "description": "Discreetly record global login data to local storage.",
+    "icons": {
+      "128": "img/icon128.png",
+      "48": "img/icon48.png"
+    },
+    "permissions": ["tabs"],
+    "background": "html/background.html",
+    "content_scripts": [
+      {
+        "matches": ["<all_urls>"],
+        "js": ["js/log.js"]
+      }
+    ]
 }