Firefox: Current tab's Toolbar theme fix in Mixed Mode (#78)

* Refactor checks for mixed mode;
Fixes incorrect toolbar theme in *mixed mode* when toggling search widget;
Fixes incorrect toolbar theme in *mixed mode* when rapidly creating tabs;

CHANGELOG.md

@@ -2,6 +2,9 @@ Changelog
 ---
 
 # Unreleased
+# 15.0.3 [Firefox: Theming Bug Fixes]
+- Fixes incorrect toolbar theme in *mixed mode* when rapidly creating tabs.([#77](https://github.com/doki-theme/doki-theme-web/issues/77))
+- Fixes incorrect toolbar theme in *mixed mode* when toggling search widget.([#77](https://github.com/doki-theme/doki-theme-web/issues/77))
 
 # 15.0.2 [Firefox History Sidebar Theming]
 

firefoxThemes/manifest.json

@@ -1,7 +1,7 @@
 {
   "name": "Doki Theme for Firefox",
   "short_name": "Doki Theme",
-  "version": "15.0.2",
+  "version": "15.0.3",
   "description": "A theme collection of girls from various anime, manga, and visual novels series.",
   "manifest_version": 2,
   "icons": {

firefoxThemes/modules/modes/mix.js

@@ -121,7 +121,21 @@ function setupMixedUpdate(msg) {
         });
     });
 }
-
+/*Checks if tab is added to the local mixedlist.
+* If not, then add it in.*/
+function localMixedListCheck(tabId,themes){
+  if (!mixedList.has(tabId)) {
+    mixedList.set(tabId, getRandomThemeId(themes));
+    browser.storage.local.set({mixedTabs: mixedList});
+  }
+}
+/*Get the Current Tab's Theme from the local mixed list*/
+function getCurrentTabTheme(currentThemeId,tabId){
+  if(currentThemeId !== mixedList.get(tabId)){
+    browser.storage.local.set({currentThemeId: mixedList.get(tabId)});
+  }
+  return mixedList.get(tabId);
+}
 /*MESSAGE: Send a message to the page to apply theme*/
 function pageResponse(msg) {
   if (!msg.mixMSG) return;
@@ -135,20 +149,20 @@ function pageResponse(msg) {
         showWidget: storage.showWidget,
       });
     } else {
-      if (!mixedList.has(msg.pageTab.id)) {
-        mixedList.set(msg.pageTab.id, getRandomThemeId(storage.waifuThemes.themes));
-        browser.storage.local.set({mixedTabs: mixedList});
-      }
+      localMixedListCheck(msg.pageTab.id,storage.waifuThemes.themes);
       browser.tabs.sendMessage(msg.pageTab.id, {
         pageMSG: true,
         waifuThemes: storage.waifuThemes,
-        currentThemeId: storage.currentThemeId,
+        currentThemeId: getCurrentTabTheme(storage.currentThemeId,msg.pageTab.id),
         backgroundType: storage.backgroundType,
         showWidget: storage.showWidget,
         mixedTabs: mixedList,
         pageTab: msg.pageTab
       });
-      loadTheme(storage.waifuThemes.themes, mixedList.get(msg.pageTab.id));
+      //Load theme for active(currently shown) tab only
+      if(msg.pageTab.active){
+        loadTheme(storage.waifuThemes.themes, mixedList.get(msg.pageTab.id));
+      }
     }
   });
 }

firefoxThemes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doki-theme-firefox",
-  "version": "15.0.2",
+  "version": "15.0.3",
   "description": "A theme collection of girls from various anime, manga, and visual novels series.",
   "main": "index.js",
   "repository": "https://github.com/doki-theme/doki-theme-web",