🐛 Fix

- Zen Mods: Default value not being loaded on theme install due to zen mods not being always triggered and default values not being in place when reading them (fixes #3887)
- Zen Mods: Fixed string preferences not changing completely by changing the event listener and replacing the throttle with a debounce, so we only listen to the last keydown (fixes #3558)

src/browser/base/zen-components/actors/ZenThemeMarketplaceParent.sys.mjs

@@ -45,7 +45,7 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent {
     window.gZenThemePicker.riceManager.openRicePage(data);
   }
 
-  compareversion(version1, version2) {
+  compareVersions(version1, version2) {
     var result = false;
     if (typeof version1 !== 'object') {
       version1 = version1.toString().split('.');
@@ -73,22 +73,31 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent {
 
   async checkForThemeUpdates() {
     console.info('ZenThemeMarketplaceParent: Checking for theme updates');
+
     let updates = [];
     this._themes = null;
+
     for (const theme of Object.values(await this.getThemes())) {
       const themeInfo = await this.sendQuery('ZenThemeMarketplace:GetThemeInfo', { themeId: theme.id });
+
       if (!themeInfo) {
         continue;
       }
-      if (!this.compareversion(themeInfo.version, theme.version || '0.0.0') && themeInfo.version != theme.version) {
+
+      if (!this.compareVersions(themeInfo.version, theme.version || '0.0.0') && themeInfo.version != theme.version) {
         console.info('ZenThemeMarketplaceParent: Theme update found', theme.id, theme.version, themeInfo.version);
+
         themeInfo.enabled = theme.enabled;
         updates.push(themeInfo);
+
         await this.removeTheme(theme.id, false);
+
         this._themes[themeInfo.id] = themeInfo;
       }
     }
+
     await this.updateThemes(this._themes);
+
     this.sendAsyncMessage('ZenThemeMarketplace:CheckForUpdatesFinished', { updates });
   }
 
@@ -166,27 +175,30 @@ export class ZenThemeMarketplaceParent extends JSWindowActorParent {
 
   async checkForThemeChanges() {
     const themes = await this.getThemes();
+
     const themeIds = Object.keys(themes);
-    let changed = false;
+
     for (const themeId of themeIds) {
       const theme = themes[themeId];
+
       if (!theme) {
         continue;
       }
+
       const themePath = PathUtils.join(this.themesRootPath, themeId);
+
       if (!(await IOUtils.exists(themePath))) {
         await this.installTheme(theme);
-        changed = true;
       }
     }
-    if (changed) {
+
-      this.triggerThemeUpdate();
+    this.triggerThemeUpdate();
-    }
   }
 
   async removeTheme(themeId, triggerUpdate = true) {
     const themePath = PathUtils.join(this.themesRootPath, themeId);
     await IOUtils.remove(themePath, { recursive: true, ignoreAbsent: true });
+
     if (triggerUpdate) {
       this.triggerThemeUpdate();
     }

src/browser/components/preferences/zen-settings.js

@@ -292,7 +292,7 @@ var gZenMarketplaceManager = {
         preferencesWrapper.setAttribute('flex', '1');
 
         for (const entry of preferences) {
-          const { property, label, type, placeholder } = entry;
+          const { property, label, type, placeholder, defaultValue } = entry;
 
           switch (type) {
             case 'dropdown': {
@@ -309,7 +309,7 @@ var gZenMarketplaceManager = {
               menulist.setAttribute('sizetopopup', 'none');
               menulist.setAttribute('id', property + '-popup-menulist');
 
-              const savedValue = Services.prefs.getStringPref(property, 'none');
+              const savedValue = Services.prefs.getStringPref(property, defaultValue ?? 'none');
 
               menulist.setAttribute('value', savedValue);
               menulist.setAttribute('tooltiptext', property);
@@ -395,7 +395,7 @@ var gZenMarketplaceManager = {
               checkboxElement.setAttribute('zen-pref', property);
 
               // Checkbox only works with "true" and "false" values, it's not like HTML checkboxes.
-              if (Services.prefs.getBoolPref(property, false)) {
+              if (Services.prefs.getBoolPref(property, defaultValue ?? false)) {
                 checkboxElement.setAttribute('checked', 'true');
               }
 
@@ -423,7 +423,7 @@ var gZenMarketplaceManager = {
               container.setAttribute('align', 'center');
               container.setAttribute('role', 'group');
 
-              const savedValue = Services.prefs.getStringPref(property, '');
+              const savedValue = Services.prefs.getStringPref(property, defaultValue ?? '');
               const sanitizedProperty = property?.replaceAll(/\./g, '-');
 
               const input = document.createElement('input');
@@ -439,8 +439,8 @@ var gZenMarketplaceManager = {
               }
 
               input.addEventListener(
-                'change',
+                'keydown',
-                ZenThemesCommon.throttle((event) => {
+                ZenThemesCommon.debounce((event) => {
                   const value = event.target.value;
 
                   Services.prefs.setStringPref(property, value);
@@ -1083,38 +1083,38 @@ Preferences.addAll([
     default: false,
   },
   {
-    id: "zen.glance.activation-method",
+    id: 'zen.glance.activation-method',
-    type: "string",
+    type: 'string',
-    default: "ctrl",
+    default: 'ctrl',
   },
   {
-    id: "zen.glance.enabled",
+    id: 'zen.glance.enabled',
-    type: "bool",
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.theme.color-prefs.use-workspace-colors",
+    id: 'zen.theme.color-prefs.use-workspace-colors',
-    type: "bool",
+    type: 'bool',
     default: false,
   },
   {
-    id: "zen.view.compact.color-toolbar",
+    id: 'zen.view.compact.color-toolbar',
-    type: "bool",
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.urlbar.behavior",
+    id: 'zen.urlbar.behavior',
-    type: "string",
+    type: 'string',
-    default: "float",
+    default: 'float',
   },
   {
-    id: "zen.view.compact.color-sidebar",
+    id: 'zen.view.compact.color-sidebar',
-    type: "bool",
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.essentials.enabled",
+    id: 'zen.essentials.enabled',
-    type: "bool",
+    type: 'bool',
     default: true,
   },
   {
@@ -1123,18 +1123,18 @@ Preferences.addAll([
     default: false,
   },
   {
-    id: "zen.tabs.show-newtab-vertical",
+    id: 'zen.tabs.show-newtab-vertical',
-    type: "bool",
+    type: 'bool',
     default: true,
   },
   {
-    id: "zen.view.show-newtab-button-border-top",
+    id: 'zen.view.show-newtab-button-border-top',
-    type: "bool",
+    type: 'bool',
     default: false,
   },
   {
-    id: "zen.view.show-newtab-button-top",
+    id: 'zen.view.show-newtab-button-top',
-    type: "bool",
+    type: 'bool',
     default: true,
   },
 ]);