Update to firefox 136.0

README.md

@@ -30,7 +30,7 @@
 
 Zen is currently built using Firefox version `135.0.1`! 🚀
 
-- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 135.0.1`!
+- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 136.0`!
 - Check out the latest [release notes](https://zen-browser.app/release-notes)!
 - Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
 

firefox-cache/l10n-last-commit-hash

@@ -1 +0,0 @@
-8d18d852fbaeaa05c6ec3ebd9b35312f2c58021f

scripts/update_ff.py

@@ -60,7 +60,7 @@ def update_readme(last_version, new_version, is_rc=False):
 def update_l10n_last_commit_hash():
   L10N_REPO = "https://github.com/mozilla-l10n/firefox-l10n"
   try:
-    os.system(f"git clone {L10N_REPO} l10n-temp")
+    os.system(f"git clone {L10N_REPO} l10n-temp --depth 1")
     if not os.path.exists("firefox-cache"):
       os.mkdir("firefox-cache")
     os.system("cat l10n-temp/.git/refs/heads/main > firefox-cache/l10n-last-commit-hash")

src/browser/base/content/aboutDialog-xhtml.patch

@@ -1,16 +1,16 @@
 diff --git a/browser/base/content/aboutDialog.xhtml b/browser/base/content/aboutDialog.xhtml
-index 1e5c0f1c59175ec4a39938974c4a7a5c6355439f..ac9fe4b792c12a1aecba1fbbc941da9be6a53ce4 100644
+index 53e4616a99b7826453d5b6dea027184d90bc73f7..90c9fe5683411cf3087bebd3d0941decf6d23e89 100644
 --- a/browser/base/content/aboutDialog.xhtml
 +++ b/browser/base/content/aboutDialog.xhtml
-@@ -36,6 +36,7 @@
+@@ -34,6 +34,7 @@
 
      <html:link rel="localization" href="branding/brand.ftl"/>
      <html:link rel="localization" href="browser/aboutDialog.ftl"/>
 +    <script src="chrome://browser/content/zenThemeModifier.js"></script>
    </linkset>
 
    <html:div id="aboutDialogContainer">
-@@ -130,13 +131,15 @@
+@@ -124,21 +125,23 @@
              </description>
            </vbox>
            <description class="text-blurb" id="communityDesc" data-l10n-id="community-2">
@@ -27,11 +27,12 @@ index 1e5c0f1c59175ec4a39938974c4a7a5c6355439f..ac9fe4b792c12a1aecba1fbbc941da9b
          </vbox>
        </vbox>
      </hbox>
-@@ -144,7 +147,7 @@
+     <vbox id="bottomBox">
        <hbox pack="center">
          <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:license" data-l10n-id="bottomLinks-license"/>
-         <label is="text-link" class="bottom-link" useoriginprincipal="true" href="about:rights" data-l10n-id="bottomLinks-rights"/>
--        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>
+-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/about/legal/terms/firefox/" data-l10n-id="bottomLinks-rights"/>
+-        <label is="text-link" class="bottom-link" href="https://www.mozilla.org/privacy/firefox/?utm_source=firefox-browser&#38;utm_medium=firefox-desktop&#38;utm_campaign=about-dialog" data-l10n-id="bottomLinks-privacy"/>
++        <label is="text-link" class="bottom-link" href="about:rights" data-l10n-id="bottomLinks-rights"/>
 +        <label is="text-link" class="bottom-link" href="https://www.zen-browser.app/privacy-policy/" data-l10n-id="bottomLinks-privacy"/>
        </hbox>
        <description id="trademark" data-l10n-id="trademarkInfo"></description>

src/browser/base/content/browser-xhtml.patch

@@ -1,16 +1,16 @@
 diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
-index 891c067d6ad718061c410c04743bed25744504b5..135c8515bbcb534c3f900e7ba1ee4d3b9fe17436 100644
+index 68849f5093cd8ab99ab0747d972799eaf3ad7e22..3b4e6a179ab7b71859f832709778c326a39cffda 100644
 --- a/browser/base/content/browser.xhtml
 +++ b/browser/base/content/browser.xhtml
-@@ -25,6 +25,7 @@
+@@ -26,6 +26,7 @@
          sizemode="normal"
          retargetdocumentfocus="urlbar-input"
          scrolling="false"
 +        zen-before-loaded="true"
          persist="screenX screenY width height sizemode"
          data-l10n-sync="true">
  <head>
-@@ -99,6 +100,8 @@
+@@ -100,6 +101,8 @@
 
    <title data-l10n-id="browser-main-window-default-title"></title>
 
@@ -19,15 +19,15 @@ index 891c067d6ad718061c410c04743bed25744504b5..135c8515bbcb534c3f900e7ba1ee4d3b
  # All JS files which are needed by browser.xhtml and other top level windows to
  # support MacOS specific features *must* go into the global-scripts.inc file so
  # that they can be shared with macWindow.inc.xhtml.
-@@ -143,6 +146,7 @@
-   window.addEventListener("DOMContentLoaded",
-     gBrowserInit.onDOMContentLoaded.bind(gBrowserInit), { once: true });
+@@ -169,6 +172,7 @@
+     });
+   });
  </script>
 +#include zen-assets.inc.xhtml
  </head>
  <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  # All sets except for popupsets (commands, keys, and stringbundles)
-@@ -164,9 +168,13 @@
+@@ -190,9 +194,13 @@
      </vbox>
    </html:template>
 

src/browser/components/tabbrowser/content/tab-js.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tab.js b/browser/components/tabbrowser/content/tab.js
-index d41c486c02a6f09dcff5741a59ad8b617294c481..8e902dcb3792c75238ac13a8bf9199b34451aa51 100644
+index 777eabb7524f2b021a03b3f54d69faee49b7381d..192d2fa058f7d9f043532c0ae6e4c08129d16b8e 100644
 --- a/browser/components/tabbrowser/content/tab.js
 +++ b/browser/components/tabbrowser/content/tab.js
 @@ -16,6 +16,7 @@
@@ -10,9 +10,9 @@ index d41c486c02a6f09dcff5741a59ad8b617294c481..8e902dcb3792c75238ac13a8bf9199b3
            <stack class="tab-icon-stack">
              <hbox class="tab-throbber"/>
              <hbox class="tab-icon-pending"/>
-@@ -35,8 +36,10 @@
+@@ -32,8 +33,10 @@
+             <hbox class="tab-secondary-label">
                <label class="tab-icon-sound-label tab-icon-sound-pip-label" data-l10n-id="browser-tab-audio-pip" role="presentation"/>
-               <label class="tab-icon-sound-label tab-icon-sound-tooltip-label" role="presentation"/>
              </hbox>
 +            <label class="tab-reset-pin-label" data-l10n-id="tab-reset-pin-label" role="presentation"/>
            </vbox>
@@ -48,24 +48,24 @@ index d41c486c02a6f09dcff5741a59ad8b617294c481..8e902dcb3792c75238ac13a8bf9199b3
      }
 
      get lastAccessed() {
-@@ -451,6 +454,8 @@
+@@ -438,6 +441,8 @@
          this.style.MozUserFocus = "ignore";
        } else if (
          event.target.classList.contains("tab-close-button") ||
 +        event.target.classList.contains("tab-reset-button") ||
 +        event.target.classList.contains("tab-reset-pin-button") ||
-         event.target.classList.contains("tab-icon-overlay")
+         event.target.classList.contains("tab-icon-overlay") ||
+         event.target.classList.contains("tab-audio-button")
        ) {
-         eventMaySelectTab = false;
-@@ -544,6 +549,7 @@
+@@ -536,6 +541,7 @@
          if (this.multiselected) {
            gBrowser.removeMultiSelectedTabs();
          } else {
 +          gZenPinnedTabManager._removePinnedAttributes(this, true);
            gBrowser.removeTab(this, {
              animate: true,
              triggeringEvent: event,
-@@ -553,6 +559,14 @@
+@@ -545,6 +551,14 @@
          // (see tabbrowser-tabs 'click' handler).
          gBrowser.tabContainer._blockDblClick = true;
        }
@@ -80,7 +80,7 @@ index d41c486c02a6f09dcff5741a59ad8b617294c481..8e902dcb3792c75238ac13a8bf9199b3
      }
 
      on_dblclick(event) {
-@@ -576,6 +590,8 @@
+@@ -568,6 +582,8 @@
            animate: true,
            triggeringEvent: event,
          });