Bug fixes, mostly dealing with previewing themes.

drsjb80 · drsjb80 · commit f3ef46a9359f · 2020-05-25T11:39:29.000-06:00
diff --git a/_locales/de/messages.json b/_locales/de/messages.json
@@ -79,14 +79,6 @@
         "description": "Title of the options menu pane",
         "message": "Thematic Einstellungen"
     },
-    "options_previewDelay_desc": {
-        "description": "Text displayed in the options pane",
-        "message": "(ms) delay."
-    },
-    "options_previewDelay_hint": {
-        "description": "Text displayed in the options pane",
-        "message": "Values between 100 and 10000"
-    },
     "options_preview_desc": {
         "description": "Text displayed in the options pane",
         "message": "Personavorschau bei Men\u00fcauswahl."
diff --git a/_locales/en_US/messages.json b/_locales/en_US/messages.json
@@ -75,13 +75,9 @@
         "description": "Title of the options menu pane",
         "message": "Thematic preferences"
     },
-    "options_previewDelay_desc": {
-        "description": "Text displayed in the options pane",
-        "message": "(ms) delay, values between 100 and 10000."
-    },
     "options_preview_desc": {
         "description": "Text displayed in the options pane",
-        "message": "Preview themes on menu selection with"
+        "message": "Preview themes on menu selection."
     },
     "options_random_desc": {
         "description": "Text displayed in the options pane",
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
@@ -79,17 +79,9 @@
         "description": "Title of the options menu pane",
         "message": "Thematic: Settaggi di Configurazione"
     },
-    "options_previewDelay_desc": {
-        "description": "Text displayed in the options pane",
-        "message": "(ms)"
-    },
-    "options_previewDelay_hint": {
-        "description": "Text displayed in the options pane",
-        "message": "Values between 100 and 10000"
-    },
     "options_preview_desc": {
         "description": "Text displayed in the options pane",
-        "message": "Anteprima del Tema selezionato nella lista\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0Ritardata di:"
+        "message": "Anteprima del Tema selezionato."
     },
     "options_random_desc": {
         "description": "Text displayed in the options pane",
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
@@ -115,14 +115,6 @@
         "message": "光标停留于选单选项​​经过一千分之",
         "description": "Text displayed in the options pane"
     },
-    "options_previewDelay_desc": {
-        "message": "秒后预览",
-        "description": "Text displayed in the options pane"
-    },
-    "options_previewDelay_hint": {
-        "message": "Values between 100 and 10000",
-        "description": "Text displayed in the options pane"
-    },
     "options_iconPreview_desc": {
         "message": "Add icon preview to menu items.",
         "description": "Text displayed in the options pane"
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
@@ -75,14 +75,6 @@
         "message": "游標停留於選單選項經過一千分之",
         "description": "Text displayed in the options pane"
     },
-    "options_previewDelay_desc": {
-        "message": "秒後預覽。",
-        "description": "Text displayed in the options pane"
-    },
-    "options_previewDelay_hint": {
-        "message": "Values between 100 and 10000",
-        "description": "Text displayed in the options pane"
-    },
     "options_iconPreview_desc": {
         "message": "在選單中顯示縮圖圖示。",
         "description": "Text displayed in the options pane"
diff --git a/background_scripts/listeners.js b/background_scripts/listeners.js
@@ -22,34 +22,20 @@ var clickListener = function(theTheme, theIndex)
     };
 };
 
-var mouseEnterListener = function(theTheme, previewDelay) 
-{
-    const MS_TO_MINUTE_CONVERSION = 60000;
-    return function() 
-    { 
-        const delayInMinutes = previewDelay/MS_TO_MINUTE_CONVERSION;
-        var innerAlarmListener = function(alarmInfo) 
-        {
+var mouseEnterListener = function(theTheme, preview) {
+    return function() { 
+        if(preview) {
             startThemePreview(theTheme);
-        };
-        previewAlarmListener = innerAlarmListener;
-        browser.alarms.create("previewAlarm", {delayInMinutes});
-        browser.alarms.onAlarm.addListener(previewAlarmListener);
+        }
     };
 };
 
-var mouseLeaveListener = function(elementClass, preview) 
-{ 
-    return function() 
-    { 
-        if(preview)
-        {
-            browser.alarms.clear("previewAlarm");
-            browser.alarms.onAlarm.removeListener(previewAlarmListener);
-            if('browserActionMenu' === elementClass)
-            {
+var mouseLeaveListener = function(elementClass, preview) { 
+    return function() { 
+        if(preview) {
+            if('browserActionMenu' === elementClass) {
                 endThemePreview();
             } 
         }
     };
-};
+};
diff --git a/background_scripts/menus.js b/background_scripts/menus.js
@@ -7,7 +7,7 @@ var loadedThemes;
 
 function getMenuData() 
 {
-    var menuPreferences = ["iconPreview", "preview", "previewDelay", "current",
+    var menuPreferences = ["iconPreview", "preview", "current",
                             "currentThemeId"];
     var getData = Promise.all([
         browser.storage.local.get(menuPreferences),
@@ -80,7 +80,7 @@ function buildMenuItem(theme, prefs, theIndex)
     if (true === prefs.preview) 
     {
         themeChoice.addEventListener('mouseenter',
-                        mouseEnterListener(theme, prefs.previewDelay));
+                        mouseEnterListener(theme, prefs.preview));
         themeChoice.addEventListener('mouseleave',
                         mouseLeaveListener('button theme', prefs.preview));
     }
diff --git a/background_scripts/prefs.js b/background_scripts/prefs.js
@@ -27,8 +27,7 @@ function reactToPrefChange(prefName, prefData)
             // of icons to the menu 
             // toggleMenuIcons(prefData.newValue);
             break;
-        case 'preview': // falls through to previewDelay
-        case 'previewDelay':
+        case 'preview':
             getMenuData().then(buildBrowserActionMenu, handleError);
             break;
         case 'debug':
diff --git a/background_scripts/rotate.js b/background_scripts/rotate.js
@@ -69,7 +69,7 @@ function autoRotate()
 
 function rotate() 
 {
-    if (1 >= currentThemes.length) return;
+    if (1 > currentThemes.length) return;
 
     var getRotatePref = browser.storage.local.get(["random", "current"]);
     getRotatePref.then((prefs) => 
diff --git a/background_scripts/startup.js b/background_scripts/startup.js
@@ -46,7 +46,6 @@ function loadDefaultPrefs()
     preferences.debug = false;
     preferences.fastSwitch = false;
     preferences.autoMinutes = 30;
-    preferences.previewDelay = 100;
     preferences.current = 0;
     preferences.currentThemeId = null;
     preferences.defaults_loaded = true; 
@@ -102,23 +101,22 @@ browser.menus.onClicked.addListener((info) =>
 
 browser.commands.onCommand.addListener(function(command) 
 {
-    switch (command) 
-    {
+    logger.log(command);
+    switch (command) {
         case "switch_to_default":
             activateDefaultTheme();
             break;
         case "rotate":
             rotate();
             break;
         case "toggle_autoswitch":
-            var getAutoPref = browser.storage.local.get("auto");
-            getAutoPref.then((pref) => 
-                {
-                    browser.storage.local.set({'auto': !pref.auto})
-                        .catch(handleError);
-                    logger.log(`Auto: ${!pref.auto}`);
-                }
-            );
+            browser.storage.local.get("auto").then((pref) => {
+                browser.storage.local.set({'auto': !pref.auto})
+                    .catch(handleError);
+                logger.log(`Auto: ${!pref.auto}`);
+                // give visual feedback
+                if(pref.auto) rotate();
+            });
             break;
         default:
             // should never get here
@@ -127,4 +125,4 @@ browser.commands.onCommand.addListener(function(command)
     }
 });
 
-handleStartup();
+handleStartup();
diff --git a/background_scripts/themes.js b/background_scripts/themes.js
diff --git a/manifest.json b/manifest.json
diff --git a/preferences/options.html b/preferences/options.html
diff --git a/preferences/options.js b/preferences/options.js

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ var loadedThemes;`
`7`	`7`
`8`	`8`	`function getMenuData()`
`9`	`9`	`{`
`10`		`- var menuPreferences = ["iconPreview", "preview", "previewDelay", "current",`
	`10`	`+ var menuPreferences = ["iconPreview", "preview", "current",`
`11`	`11`	`"currentThemeId"];`
`12`	`12`	`var getData = Promise.all([`
`13`	`13`	`browser.storage.local.get(menuPreferences),`
`@@ -80,7 +80,7 @@ function buildMenuItem(theme, prefs, theIndex)`
`80`	`80`	`if (true === prefs.preview)`
`81`	`81`	`{`
`82`	`82`	`themeChoice.addEventListener('mouseenter',`
`83`		`- mouseEnterListener(theme, prefs.previewDelay));`
	`83`	`+ mouseEnterListener(theme, prefs.preview));`
`84`	`84`	`themeChoice.addEventListener('mouseleave',`
`85`	`85`	`mouseLeaveListener('button theme', prefs.preview));`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function autoRotate()`
`69`	`69`
`70`	`70`	`function rotate()`
`71`	`71`	`{`
`72`		`- if (1 >= currentThemes.length) return;`
	`72`	`+ if (1 > currentThemes.length) return;`
`73`	`73`
`74`	`74`	`var getRotatePref = browser.storage.local.get(["random", "current"]);`
`75`	`75`	`getRotatePref.then((prefs) =>`