Some code cleanup and maintenance

passwordmaker · May 1, 2015 · 6ebb3e8 · 6ebb3e8
1 parent 75002b3
commit 6ebb3e8
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 24 deletions.
diff --git a/javascript/options.js b/javascript/options.js
@@ -103,10 +103,10 @@ function oldHashWarning(hash) {
     var bugged = { "md5_v6": 1, "hmac-md5_v6": 1, "hmac-sha256": 1 };
     if (bugged[hash]) {
         if (confirm("Are you sure you want to continue using a legacy algorithm which is incorrectly implemented?")) {
-           alert("Please change to using a correct & secure algorithm!\n\nThe old/bugged/legacy algorithms " +
-           "are harmful to your online security and should be avoided at ALL costs.\n\n" +
-           "Please change your passwords on the sites which you are using this algorithm if you are able to " +
-           "as soon as possible.\n\nThank you\n");
+            alert("Please change to using a correct & secure algorithm!\n\nThe old/bugged/legacy algorithms " +
+                "are harmful to your online security and should be avoided at ALL costs.\n\n" +
+                "Please change your passwords on the sites which you are using this algorithm if you are able to " +
+                "as soon as possible.\n\nThank you\n");
         } else {
             alert("Please select one of the correct and secure hash algorithms below :)");
         }
@@ -251,7 +251,7 @@ function setSyncPassword() {
 
     var result = Settings.startSyncWith($("#syncProfilesPassword").val());
     if (result) {
-        localStorage.setItem("sync_profiles", true);
+        localStorage.setItem("sync_profiles", "true");
         localStorage.setItem("sync_profiles_password", result);
         Settings.syncDataAvailable = true;
         $("#syncProfilesPassword").val("");
@@ -265,7 +265,7 @@ function setSyncPassword() {
 function clearSyncData() {
     chrome.storage.sync.clear(function() {
         if (chrome.runtime.lastError === undefined) {
-            localStorage.setItem("sync_profiles", false);
+            localStorage.setItem("sync_profiles", "false");
             Settings.syncDataAvailable = false;
             localStorage.removeItem("synced_profiles");
             localStorage.removeItem("synced_profiles_keys");
@@ -305,16 +305,16 @@ function updateMasterHash() {
         $("#master_password_row").removeClass("hidden");
         var master_pass = $("#masterPassword").val();
         if (master_pass.length > 0) {
-            localStorage.setItem("keep_master_password_hash", true);
+            localStorage.setItem("keep_master_password_hash", "true");
             localStorage.setItem("master_password_hash", JSON.stringify(Settings.make_pbkdf2(master_pass)));
         } else {
-            localStorage.setItem("keep_master_password_hash", false);
+            localStorage.setItem("keep_master_password_hash", "false");
             localStorage.removeItem("master_password_hash");
         }
     } else {
         $("#master_password_row").addClass("hidden");
         $("#masterPassword").val("");
-        localStorage.setItem("keep_master_password_hash", false);
+        localStorage.setItem("keep_master_password_hash", "false");
         localStorage.removeItem("master_password_hash");
     }
 }
@@ -327,8 +327,8 @@ function updateDisablePasswordSaving() {
         localStorage.removeItem("password_crypt");
         Settings.setBgPassword("");
     }
-
 }
+
 function updateHidePassword() {
     localStorage.setItem("show_generated_password", $("#hidePassword").prop("checked"));
 }
@@ -401,7 +401,9 @@ function fileImport() {
 }
 
 function fileExport() {
-    var textFileAsBlob = new Blob([$("#exportText").val()], {type: "application/rdf+xml"});
+    var textFileAsBlob = new Blob([$("#exportText").val()], {
+        type: "application/rdf+xml"
+    });
     var downloadLink = document.createElement("a");
     downloadLink.href = window.URL.createObjectURL(textFileAsBlob);
     downloadLink.download = "PasswordMaker Pro Profile Data.rdf";

diff --git a/javascript/settings.js b/javascript/settings.js
@@ -1,7 +1,7 @@
 var Settings = {
     currentUrl: "",
-    storeLocation: localStorage.getItem("store_location") || "memory",
     profiles: [],
+    storeLocation: localStorage.getItem("store_location") || "memory",
     syncDataAvailable: false
 };
 
@@ -225,7 +225,7 @@ Settings.shouldShowStrength = function() {
 
 Settings.stopSync = function() {
     localStorage.removeItem("sync_profiles_password");
-    localStorage.setItem("sync_profiles", false);
+    localStorage.setItem("sync_profiles", "false");
     Settings.loadLocalProfiles();
 };
 

diff --git a/test/index.html b/test/index.html
@@ -7,17 +7,17 @@
     <script src="qunit.js"></script>
     <script src="import.js"></script>
 
-   <script src="../javascript/jquery.min.js"></script>
-   <script src="../javascript/passwordmaker/hashutils.js"></script>
-   <script src="../javascript/passwordmaker/md4.js"></script>
-   <script src="../javascript/passwordmaker/md5.js"></script>
-   <script src="../javascript/passwordmaker/sha256.js"></script>
-   <script src="../javascript/passwordmaker/sha1.js"></script>
-   <script src="../javascript/passwordmaker/ripemd160.js"></script>
-   <script src="../javascript/passwordmaker/l33t.js"></script>
-   <script src="../javascript/settings.js"></script>
-   <script src="../javascript/profile.js"></script>
-   <script src="../javascript/import.js"></script>
+    <script src="../javascript/jquery.min.js"></script>
+    <script src="../javascript/passwordmaker/hashutils.js"></script>
+    <script src="../javascript/passwordmaker/md4.js"></script>
+    <script src="../javascript/passwordmaker/md5.js"></script>
+    <script src="../javascript/passwordmaker/sha256.js"></script>
+    <script src="../javascript/passwordmaker/sha1.js"></script>
+    <script src="../javascript/passwordmaker/ripemd160.js"></script>
+    <script src="../javascript/passwordmaker/l33t.js"></script>
+    <script src="../javascript/settings.js"></script>
+    <script src="../javascript/profile.js"></script>
+    <script src="../javascript/import.js"></script>
 
     <!-- NOTE: tests included at bottom -->
 </head>