Merge branch 'main' into shortcuts-redo

src/browser/components/customizableui/CustomizableUI-sys-mjs.patch

@@ -1,8 +1,16 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 289c3df7dcd6fa6b35681ce61c1e920b6a2651d7..07ecece92643203d376378818facfc55774c63e9 100644
+index 289c3df7dcd6fa6b35681ce61c1e920b6a2651d7..aa7d86770cce41a720e92f63392a763b16381f55 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
-@@ -25,7 +25,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
+@@ -13,6 +13,7 @@ ChromeUtils.defineESModuleGetters(lazy, {
+   AddonManagerPrivate: "resource://gre/modules/AddonManager.sys.mjs",
+   BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs",
+   CustomizableWidgets: "resource:///modules/CustomizableWidgets.sys.mjs",
++  ZenCustomizableUI: "chrome://browser/content/ZenCustomizableUI.sys.mjs",
+   HomePage: "resource:///modules/HomePage.sys.mjs",
+   PanelMultiView: "resource:///modules/PanelMultiView.sys.mjs",
+   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.sys.mjs",
+@@ -25,7 +26,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
    return Services.strings.createBundle(kUrl);
  });
  
@@ -11,7 +19,16 @@ index 289c3df7dcd6fa6b35681ce61c1e920b6a2651d7..07ecece92643203d376378818facfc55
  
  const kSpecialWidgetPfx = "customizableui-special-";
  
-@@ -253,10 +253,9 @@ var CustomizableUIInternal = {
+@@ -222,6 +223,8 @@ var CustomizableUIInternal = {
+     this._updateForNewProtonVersion();
+     this._markObsoleteBuiltinButtonsSeen();
+ 
++    lazy.ZenCustomizableUI.startup(this);
++
+     this.registerArea(
+       CustomizableUI.AREA_FIXED_OVERFLOW_PANEL,
+       {
+@@ -253,10 +256,9 @@ var CustomizableUIInternal = {
        "spring",
        "urlbar-container",
        "spring",
@@ -23,7 +40,7 @@ index 289c3df7dcd6fa6b35681ce61c1e920b6a2651d7..07ecece92643203d376378818facfc55
        lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
      ].filter(name => name);
  
-@@ -288,10 +287,10 @@ var CustomizableUIInternal = {
+@@ -288,10 +290,10 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [
@@ -37,7 +54,7 @@ index 289c3df7dcd6fa6b35681ce61c1e920b6a2651d7..07ecece92643203d376378818facfc55
          ],
          defaultCollapsed: null,
        },
-@@ -331,6 +330,7 @@ var CustomizableUIInternal = {
+@@ -331,6 +333,7 @@ var CustomizableUIInternal = {
        CustomizableUI.AREA_NAVBAR,
        CustomizableUI.AREA_BOOKMARKS,
        CustomizableUI.AREA_TABSTRIP,
@@ -45,3 +62,13 @@ index 289c3df7dcd6fa6b35681ce61c1e920b6a2651d7..07ecece92643203d376378818facfc55
      ]);
      if (AppConstants.platform != "macosx") {
        toolbars.add(CustomizableUI.AREA_MENUBAR);
+@@ -3289,6 +3292,9 @@ var CustomizableUIInternal = {
+         gSeenWidgets.add(widgetId);
+       }
+     }
++
++    
++
+     if (gSeenWidgets.size || gNewElementCount) {
+       gDirty = true;
+       this.saveState();

src/browser/components/places/content/zenNewWebPanel.js

@@ -34,7 +34,7 @@ var gZenNewWebPanel = {
   handleDialogAccept: async function (aEvent) {
     document.commandDispatcher.focusedElement?.blur();
     let url = document.getElementById('zenNWP_url');
-    let ua = document.getElementById('zenNWP_userAgent');
+    let ua = document.getElementById('zenNWP_userAgent'); // checbkox
     if (!url || !ua) {
       return;
     }
@@ -44,12 +44,12 @@ var gZenNewWebPanel = {
     } catch (_) {
       urlValue = this.addHttpIfMissing(url.value);
     }
-    if (!url.value || !ua.value) {
+    if (!url.value) {
       return;
     }
     let newSite = {
       url: urlValue,
-      ua: ua.value,
+      ua: ua.checked,
     };
     let currentData = JSON.parse(Services.prefs.getStringPref('zen.sidebar.data'));
     let newName = 'p' + new Date().getTime();

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

@@ -499,22 +499,26 @@ var gZenLooksAndFeel = {
   setCompactModeStyle() {
     const chooser = document.getElementById('zen-compact-mode-styles-form');
     const radios = [...chooser.querySelectorAll('input')];
-    for (let radio of radios) {
-      if (radio.value === 'left' && Services.prefs.getBoolPref('zen.view.compact.hide-tabbar')) {
-        radio.checked = true;
-      } else if (radio.value === 'top' && Services.prefs.getBoolPref('zen.view.compact.hide-toolbar')) {
-        radio.checked = true;
-      } else if (
-        radio.value === 'both' &&
-        !Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') &&
-        !Services.prefs.getBoolPref('zen.view.compact.hide-toolbar')
-      ) {
-        radio.checked = true;
+
+    let value = '';
+    if (Services.prefs.getBoolPref('zen.view.compact.hide-tabbar')
+          && Services.prefs.getBoolPref('zen.view.compact.hide-toolbar')) {
+      value = 'both';
+    } else {
+      value = Services.prefs.getBoolPref('zen.view.compact.hide-tabbar') ? 'left' : 'top';
+    }
+    chooser.querySelector(`[value='${value}']`).checked = true;
+    const disableExpandTabsOnHover = () => {
+      if (Services.prefs.getBoolPref('zen.view.sidebar-expanded.on-hover')) {
+        document.querySelector(`#zen-expand-tabbar-strat input[value='expand']`).click();
       }
+    }
+    for (let radio of radios) {
       radio.addEventListener('change', (e) => {
         let value = e.target.value;
         switch (value) {
           case 'left':
+            disableExpandTabsOnHover();
             Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
             Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', false);
             break;
@@ -523,6 +527,7 @@ var gZenLooksAndFeel = {
             Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
             break;
           default:
+            disableExpandTabsOnHover();
             Services.prefs.setBoolPref('zen.view.compact.hide-tabbar', true);
             Services.prefs.setBoolPref('zen.view.compact.hide-toolbar', true);
             break;
@@ -543,6 +548,14 @@ var gZenLooksAndFeel = {
     } else {
       form.querySelector('input[value="none"]').checked = true;
     }
+    const disableCompactTabbar = () => {
+      const toolbarEnable = Services.prefs.getBoolPref('zen.view.compact.hide-toolbar');
+      if (toolbarEnable) {
+        document.querySelector(`#ZenCompactModeStyle input[value='top']`).click();
+      } else if (Services.prefs.getBoolPref('zen.view.compact')) {
+        document.getElementById('zenLooksAndFeelShowCompactView').click();
+      }
+    }
     for (let radio of radios) {
       radio.addEventListener('change', (e) => {
         switch (e.target.value) {
@@ -555,6 +568,7 @@ var gZenLooksAndFeel = {
             Services.prefs.setBoolPref(defaultExpandPref, false);
             break;
           case 'hover':
+            disableCompactTabbar();
             Services.prefs.setBoolPref(onHoverPref, true);
             Services.prefs.setBoolPref(defaultExpandPref, true);
             break;
@@ -700,7 +714,7 @@ var gZenCKSSettings = {
     }
   },
 
-  _resetShortcut(input) {
+  async _resetShortcut(input) {
     input.value = 'Not set';
     input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-invalid`);
     input.classList.remove(`${ZEN_CKS_INPUT_FIELD_CLASS}-editing`);
@@ -708,7 +722,7 @@ var gZenCKSSettings = {
 
     if (this._currentAction) {
       this._editDone();
-      gZenKeyboardShortcutsManager.setShortcut(this._currentAction, null, null);
+      await gZenKeyboardShortcutsManager.setShortcut(this._currentAction, null, null);
     }
   },
 
@@ -718,7 +732,7 @@ var gZenCKSSettings = {
   },
 
   //TODO Check for duplicates
-  _handleKeyDown(event) {
+  async _handleKeyDown(event) {
     event.preventDefault();
 
     if (!this._currentAction) {