Merge pull request #94 from LEDfan/macctrl

Use MacCtrl for keyboard shortcuts + some linting fixes
LEDfan · Dec 2, 2017 · 4255c2e · 4255c2e
2 parents 5b34530 + 4adf94e
commit 4255c2e
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/background/LocalSecureStorage.prompts.js b/background/LocalSecureStorage.prompts.js
@@ -26,7 +26,6 @@ LocalSecureStorage.prompts.setupNewPassword = function () {
       'type': 'panel',
       'width': 400,
       'height': 600,
-      'incognito': false,
       'url': url,
       'incognito': true
     }).then(function (newWindow) {
@@ -67,7 +66,6 @@ LocalSecureStorage.prompts.unlock = function (verifyFunc) {
       'type': 'panel',
       'width': 400,
       'height': 600,
-      'incognito': false,
       'url': url,
       'incognito': true
     }).then(function (newWindow) {

diff --git a/content_scripts/fix-contentEditable.js b/content_scripts/fix-contentEditable.js
@@ -27,12 +27,12 @@ function fixContentEditable() {
   for (const el of inputEls) {
     el.contentEditable = 'true';
   }
-  if (window.location.hostname === "login.live.com") {
+  if (window.location.hostname === 'login.live.com') {
     // see https://github.com/LEDfan/keywi/issues/80
     // see https://github.com/LEDfan/keywi/pull/81
     // see https://github.com/LEDfan/keywi/pull/83
     // see https://github.com/LEDfan/keywi/pull/84
-    for (let el of document.getElementsByClassName('phholder')) {
+    for (const el of document.getElementsByClassName('phholder')) {
       el.style['pointer-events'] = 'none';
     }
   }
@@ -43,4 +43,4 @@ fixContentEditable();
 /**
  * Some websites dynamically add elements to the DOM.
  */
-document.addEventListener("contextmenu", fixContentEditable, true);
+document.addEventListener('contextmenu', fixContentEditable, true);
diff --git a/dialog/dialog_common.js b/dialog/dialog_common.js
@@ -30,8 +30,8 @@ window.addEventListener('DOMContentLoaded', function () {
   // browser.windows.create won't show contents unless resized.
   // See https://bugzilla.mozilla.org/show_bug.cgi?id=1402110
   browser.windows.getCurrent((win) => {
-    browser.windows.update(win.id, {width:win.width+1})
-  })
+    browser.windows.update(win.id, {'width': win.width + 1});
+  });
 });
 
 document.addEventListener('keyup', function (ev) {

diff --git a/manifest.json b/manifest.json
@@ -52,13 +52,13 @@
   "commands": {
     "fill-form": {
       "suggested_key": {
-        "default": "Ctrl+Shift+F"
+        "default": "MacCtrl+Shift+F"
       },
       "description": "__MSG_fillUsernamePassDescription__"
     },
     "fill-password": {
       "suggested_key": {
-        "default": "Ctrl+Shift+D"
+        "default": "MacCtrl+Shift+D"
       },
       "description": "__MSG_fillPassDescription__"
     }