diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..4a7ea3036 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,12 @@ +root = true + +[*] +indent_style = space +indent_size = 2 +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true + +[*.md] +trim_trailing_whitespace = false diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3a8365b99..2e6c49487 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: false +blank_issues_enabled: false contact_links: - name: Feature Request url: https://github.com/zen-browser/desktop/discussions diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f3cff9074..4b037f71a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -153,7 +153,7 @@ jobs: with: commit_message: 🔖 Update version to ${{ steps.data.outputs.version }} commit_user_name: Zen Browser Robot - commit_user_email: zen-browser-bot@users.noreply.github.com + commit_user_email: zen-browser-auto@users.noreply.github.com check-release: runs-on: ubuntu-latest @@ -209,7 +209,7 @@ jobs: contents: write runs-on: ubuntu-latest needs: [build-data, check-release] - + steps: - name: Checkout repository uses: actions/checkout@v4 @@ -345,7 +345,7 @@ jobs: run: | npm install -g pnpm sudo apt-get update - sudo apt-get -y install libfuse2 desktop-file-utils appstream + sudo apt-get -y install libfuse2 desktop-file-utils appstream - name: Download Linux build uses: actions/download-artifact@v4 @@ -437,7 +437,7 @@ jobs: mkdir -p updates cp -a ../linux_update_manifest_generic/. updates/ cp -a ../linux_update_manifest_specific/. updates/ - cp -a ../linux_update_manifest_aarch64/. updates/ + cp -a ../linux_update_manifest_aarch64/. updates/ if [[ $RELEASE_BRANCH == 'alpha' ]]; then cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/ @@ -457,7 +457,7 @@ jobs: with: commit_message: 🚀 Update update manifests commit_user_name: Zen Browser Robot - commit_user_email: zen-browser-bot@users.noreply.github.com + commit_user_email: zen-browser-auto@users.noreply.github.com repository: ./updates-server # If we are on Twilight, we want to just update the Twilight tag's release @@ -566,7 +566,7 @@ jobs: with: commit_message: 🚀 Update releases for Flatpak commit_user_name: Zen Browser Robot - commit_user_email: zen-browser-bot@users.noreply.github.com + commit_user_email: zen-browser-auto@users.noreply.github.com - name: Checkout Flatpak repository uses: actions/checkout@v4 @@ -589,7 +589,7 @@ jobs: with: commit_message: '[release]: Update Flatpak manifest' commit_user_name: Zen Browser Robot - commit_user_email: zen-browser-bot@users.noreply.github.com + commit_user_email: zen-browser-auto@users.noreply.github.com repository: ./flatpak - name: Wait 4 minutes for the Flatpak repo to update @@ -673,10 +673,10 @@ jobs: git-token: ${{ secrets.DEPLOY_KEY }} delete-branch: true - release-homebrew: + release-homebrew-alpha: if: ${{ inputs.create_release && inputs.update_branch == 'alpha' }} permissions: write-all - name: Homebrew release + name: Homebrew release for alpha build needs: [release, mac, build-data] runs-on: macos-latest @@ -690,10 +690,35 @@ jobs: - name: Setup Git uses: Homebrew/actions/git-user-config@master with: - username: zen-browser-bot + username: zen-browser-auto - - name: Bump zen-browser + - name: Bump cask uses: Homebrew/actions/bump-packages@master with: token: ${{ secrets.DEPLOY_KEY }} casks: zen-browser + + release-homebrew-twilight: + if: ${{ inputs.create_release && inputs.update_branch == 'twilight' }} + permissions: write-all + name: Homebrew release for twilight build + needs: [release, mac, build-data] + runs-on: macos-latest + + steps: + - name: Set up Homebrew + uses: Homebrew/actions/setup-homebrew@master + with: + cask: true + test-bot: false + + - name: Setup git + uses: Homebrew/actions/git-user-config@master + with: + username: zen-browser-auto + + - name: Bump cask + uses: Homebrew/actions/bump-packages@master + with: + token: ${{ secrets.DEPLOY_KEY }} + casks: zen-browser@twilight diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index 71bd23beb..538ffce07 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -88,9 +88,10 @@ jobs: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT - name: Install dependencies - run: pnpm install + run: | + pnpm install - - name: Load Surfer CI setup + - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} - name: Download Firefox source and dependencies diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index 4c19c0358..c5e82cafd 100644 --- a/.github/workflows/update-submodules.yml +++ b/.github/workflows/update-submodules.yml @@ -28,4 +28,4 @@ jobs: with: commit_message: "[skip ci] 📦 Update submodules" commit_user_name: Zen Browser Robot - commit_user_email: zen-browser-bot@users.noreply.github.com + commit_user_email: zen-browser-auto@users.noreply.github.com diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml index 2606558ea..aa1487c73 100644 --- a/.github/workflows/windows-profile-build.yml +++ b/.github/workflows/windows-profile-build.yml @@ -71,7 +71,7 @@ jobs: - name: Download Firefox and dependencies run: | - git config --global core.safecrlf false + git config --global core.safecrlf false pnpm surfer download - name: Import patches diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index dac7b14cb..07e36beb5 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -28,7 +28,7 @@ jobs: fail-fast: false matrix: arch: [x86_64, x86_64-v3, aarch64] - + steps: - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@main @@ -213,7 +213,7 @@ jobs: find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \; fi - - name: Upload artifact (dist object) + - name: Upload dist object if: ${{ !inputs.generate-gpo }} uses: actions/upload-artifact@v4 with: diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..209e3ef4b --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +20 diff --git a/.python-version b/.python-version new file mode 100644 index 000000000..2c0733315 --- /dev/null +++ b/.python-version @@ -0,0 +1 @@ +3.11 diff --git a/README.md b/README.md index f28410bb3..bd476964b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ ## 🖥️ Compatibility -Zen is currently built using firefox version `132.0.1`! 🚀 +Zen is currently built using firefox version `133.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! diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1 index 9d2ddd857..c322bc279 100644 --- a/build/winsign/sign.ps1 +++ b/build/winsign/sign.ps1 @@ -12,19 +12,22 @@ mkdir windsign-temp -ErrorAction SilentlyContinue # Download in parallel #show output too -Start-Job -Name "DownloadGitObjectsRepo" -ScriptBlock { - param($PWD) - echo "Downloading git objects repo to $PWD\windsign-temp\windows-binaries" - git clone https://github.com/zen-browser/windows-binaries.git $PWD\windsign-temp\windows-binaries - echo "Downloaded git objects repo to" -} -Verbose -ArgumentList $PWD -Debug +#Start-Job -Name "DownloadGitObjectsRepo" -ScriptBlock { +# param($PWD) +# echo "Downloading git objects repo to $PWD\windsign-temp\windows-binaries" +# git clone https://github.com/zen-browser/windows-binaries.git $PWD\windsign-temp\windows-binaries +# echo "Downloaded git objects repo to" +#} -Verbose -ArgumentList $PWD -Debug +gh run download $GithubRunId --name windows-x64-obj-arm64 -D windsign-temp\windows-x64-obj-arm64 +echo "Downloaded arm64 artifacts" gh run download $GithubRunId --name windows-x64-obj-specific -D windsign-temp\windows-x64-obj-specific echo "Downloaded specific artifacts" gh run download $GithubRunId --name windows-x64-obj-generic -D windsign-temp\windows-x64-obj-generic echo "Downloaded generic artifacts" -Wait-Job -Name "DownloadGitObjectsRepo" + +#Wait-Job -Name "DownloadGitObjectsRepo" mkdir engine\obj-x86_64-pc-windows-msvc\ -ErrorAction SilentlyContinue @@ -46,9 +49,13 @@ function SignAndPackage($name) { $env:SURFER_SIGNING_MODE="sign" $env:MAR="$PWD\\build\\winsign\\mar.exe" if ($name -eq "generic") { - $env:SURFER_COMPAT="true" + $env:SURFER_COMPAT="x86_64" } else { - rm env:SURFER_COMPAT -ErrorAction SilentlyContinue + if ($name -eq "arm64") { + $env:SURFER_COMPAT="aarch64" + } else { + $env:SURFER_COMPAT="x86_64-v3" + } } echo "Compat Mode? $env:SURFER_COMPAT" @@ -67,21 +74,28 @@ function SignAndPackage($name) { mkdir windsign-temp\windows-x64-signed-$name # Move the MAR, add the `-generic` suffix if needed - if ($name -eq "generic") { - mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows-generic.mar + echo "Moving MAR for $name" + if ($name -eq "generic" -or $name -eq "arm64") { + mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows-$name.mar } else { mv .\dist\output.mar windsign-temp\windows-x64-signed-$name\windows.mar } # Move the installer - if ($name -eq "generic") { - mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer-generic.exe + echo "Moving installer for $name" + if ($name -eq "generic" -or $name -eq "arm64") { + mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer-$name.exe } else { mv .\dist\zen.installer.exe windsign-temp\windows-x64-signed-$name\zen.installer.exe } # Move the zip - mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip + echo "Moving zip for $name" + if ($name -eq "arm64") { + mv (Get-Item .\dist\*.en-US.win64-aarch64.zip) windsign-temp\windows-x64-signed-$name\zen.win-arm64.zip + } else { + mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip + } # Extract the zip, sign everything inside, and repackage it Expand-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name.zip -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name @@ -103,6 +117,7 @@ function SignAndPackage($name) { echo "Finished $name" } +SignAndPackage arm64 SignAndPackage specific SignAndPackage generic @@ -121,7 +136,9 @@ echo "All the artifacts (Generic and Specific) are signed and packaged, get a re Read-Host "Press Enter to continue" echo "Cleaning up" -rmdir windsign-temp -Recurse -ErrorAction SilentlyContinue +rmdir windsign-temp\windows-x64-obj-specific -Recurse -ErrorAction SilentlyContinue +rmdir windsign-temp\windows-x64-obj-generic -Recurse -ErrorAction SilentlyContinue +rmdir windsign-temp\windows-x64-obj-arm64 -Recurse -ErrorAction SilentlyContinue echo "Opening visual studio code" code . diff --git a/configs/common/mozconfig b/configs/common/mozconfig index 6e5c1af43..3343426ab 100644 --- a/configs/common/mozconfig +++ b/configs/common/mozconfig @@ -35,7 +35,6 @@ if test "$ZEN_RELEASE"; then ac_add_options --disable-debug-js-modules ac_add_options --disable-tests - ac_add_options --disable-jprof ac_add_options --disable-vtune ac_add_options --enable-rust-simd diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig index 0a1fa65f2..4bf793039 100644 --- a/configs/macos/mozconfig +++ b/configs/macos/mozconfig @@ -6,9 +6,10 @@ ac_add_options --enable-eme=widevine export MOZ_MACBUNDLE_ID=${appId} export MOZ_MACBUNDLE_NAME="Zen Browser.app" +export MOZ_PGO=1 +ac_add_options MOZ_PGO=1 + if test "$SURFER_COMPAT" = "x86_64"; then - export MOZ_PGO=1 - ac_add_options MOZ_PGO=1 ac_add_options --target=x86_64-apple-darwin ac_add_options --enable-wasm-avx diff --git a/package.json b/package.json index 096417839..14a77dbf4 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ }, "homepage": "https://github.com/zen-browser/core#readme", "dependencies": { - "@zen-browser/surfer": "^1.6.2" + "@zen-browser/surfer": "^1.6.4" }, "devDependencies": { "husky": "^9.1.5", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7273241c0..46a49dd57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -9,8 +9,8 @@ importers: .: dependencies: '@zen-browser/surfer': - specifier: ^1.6.2 - version: 1.6.2 + specifier: ^1.6.4 + version: 1.6.4 devDependencies: husky: specifier: ^9.1.5 @@ -119,8 +119,8 @@ packages: '@types/node@17.0.45': resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==} - '@zen-browser/surfer@1.6.2': - resolution: {integrity: sha512-Go8RYGgHQLSffltLIhaYaKLDUW1Z7qyMUiC8SRTtSqmC7OPacdngX1uCYVMyaNpGkpV0xuZiAkToFYVMQY7Z7w==} + '@zen-browser/surfer@1.6.4': + resolution: {integrity: sha512-JmTHLHTbTLPgrakdU/m1KQgetPMQNGjYgGGVoi2AenvVDlJf3j+L2it0XehAqRFIQhXmbEuF1nSDV4Vla/vUUg==} hasBin: true ansi-escapes@7.0.0: @@ -1003,7 +1003,7 @@ snapshots: '@types/node@17.0.45': {} - '@zen-browser/surfer@1.6.2': + '@zen-browser/surfer@1.6.4': dependencies: '@resvg/resvg-js': 1.4.0 async-icns: 1.0.2 diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index f7df0d30a..78b7c6d4a 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -76,7 +76,7 @@ pref('zen.welcomeScreen.seen', false); pref('zen.tabs.vertical', true); pref('zen.tabs.vertical.right-side', false); -pref('zen.theme.accent-color', "#aac7ff"); +pref('zen.theme.accent-color', "#ffb787"); pref('zen.theme.content-element-separation', 6); // In pixels pref('zen.theme.pill-button', false); pref('zen.theme.gradient', true); @@ -111,17 +111,15 @@ pref('zen.view.compact.color-sidebar', true); pref('zen.glance.enabled', true); pref('zen.glance.hold-duration', 300); // in ms -#ifdef XP_MACOSX pref('zen.glance.activation-method', 'alt'); // ctrl, alt, shift, none, hold -#else -pref('zen.glance.activation-method', 'ctrl'); // ctrl, alt, shift, none, hold -#endif pref('zen.view.sidebar-height-throttle', 200); // in ms pref('zen.view.sidebar-expanded.max-width', 400); pref('zen.view.show-bottom-border', false); -pref('zen.view.use-single-toolbar', false, locked); +pref('zen.view.use-single-toolbar', true); +pref('zen.view.sidebar-expanded', true); +pref('zen.view.sidebar-collapsed.hide-mute-button', true); #ifndef XP_MACOSX pref('zen.view.hide-window-controls', true); diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs index b4a22ae10..39a66a713 100644 --- a/src/browser/base/content/ZenCustomizableUI.sys.mjs +++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs @@ -34,7 +34,7 @@ export var ZenCustomizableUI = new (class { _addSidebarButtons(window) { const sidebarBox = window.MozXULElement.parseXULToFragment(` + diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs index bc17c2959..483d7210c 100644 --- a/src/browser/base/content/ZenUIManager.mjs +++ b/src/browser/base/content/ZenUIManager.mjs @@ -12,7 +12,7 @@ var gZenUIManager = { 'zen.theme.content-element-separation', 0 ); - + function throttle(f, delay) { let timer = 0; return function (...args) { @@ -126,6 +126,7 @@ var gZenVerticalTabsManager = { Services.prefs.addObserver('zen.tabs.vertical.right-side', updateEvent); Services.prefs.addObserver('zen.view.sidebar-expanded.max-width', updateEvent); Services.prefs.addObserver('zen.view.use-single-toolbar', updateEvent); + Services.prefs.addObserver('zen.view.sidebar-expanded', updateEvent); this._toolbarOriginalParent = document.getElementById('nav-bar').parentElement; @@ -154,6 +155,11 @@ var gZenVerticalTabsManager = { } }, + toggleExpand() { + const newVal = !Services.prefs.getBoolPref('zen.view.sidebar-expanded'); + Services.prefs.setBoolPref('zen.view.sidebar-expanded', newVal); + }, + get navigatorToolbox() { if (this._navigatorToolbox) { return this._navigatorToolbox; @@ -202,15 +208,16 @@ var gZenVerticalTabsManager = { const topButtons = document.getElementById('zen-sidebar-top-buttons'); const isCompactMode = Services.prefs.getBoolPref('zen.view.compact'); const isVerticalTabs = Services.prefs.getBoolPref('zen.tabs.vertical'); + const isSidebarExpanded = Services.prefs.getBoolPref('zen.view.sidebar-expanded') || !isVerticalTabs; const isRightSide = Services.prefs.getBoolPref('zen.tabs.vertical.right-side') && isVerticalTabs; - const isSingleToolbar = Services.prefs.getBoolPref('zen.view.use-single-toolbar') && isVerticalTabs; + const isSingleToolbar = Services.prefs.getBoolPref('zen.view.use-single-toolbar') && (isVerticalTabs && isSidebarExpanded) || !isVerticalTabs; const titlebar = document.getElementById('titlebar'); gBrowser.tabContainer.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal'); gBrowser.tabContainer.arrowScrollbox.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal'); const buttonsTarget = document.getElementById('zen-sidebar-top-buttons-customization-target'); - if (isRightSide && isVerticalTabs) { + if (isRightSide) { this.navigatorToolbox.setAttribute('zen-right-side', 'true'); document.documentElement.setAttribute('zen-right-side', 'true'); } else { @@ -218,8 +225,14 @@ var gZenVerticalTabsManager = { document.documentElement.removeAttribute('zen-right-side'); } + if (isSidebarExpanded) { + this.navigatorToolbox.setAttribute('zen-sidebar-expanded', 'true'); + } else { + this.navigatorToolbox.removeAttribute('zen-sidebar-expanded'); + } + const appContentNavbarContaienr = document.getElementById('zen-appcontent-navbar-container'); - if ((!isRightSide && this.isWindowsStyledButtons) || (isRightSide && !this.isWindowsStyledButtons)) { + if ((!isRightSide && this.isWindowsStyledButtons) || (isRightSide && !this.isWindowsStyledButtons) || isCompactMode) { appContentNavbarContaienr.setAttribute('should-hide', 'true'); } else { appContentNavbarContaienr.removeAttribute('should-hide'); @@ -237,9 +250,9 @@ var gZenVerticalTabsManager = { // tabboxWrapper.prepend(this.navigatorToolbox); } - if (!isVerticalTabs) { - document.getElementById("urlbar-container").after(document.getElementById('navigator-toolbox')); - } + //if (!isVerticalTabs) { + // document.getElementById("urlbar-container").after(document.getElementById('navigator-toolbox')); + //} let windowButtons = this.actualWindowButtons; let doNotChangeWindowButtons = !isCompactMode && isRightSide && this.isWindowsStyledButtons; @@ -305,9 +318,9 @@ var gZenVerticalTabsManager = { } } else { if (isRightSide) { - document.getElementById('zen-appcontent-navbar-container').prepend(windowButtons); + document.getElementById('zen-appcontent-navbar-container').appendChild(windowButtons); } else { - navBar.prepend(windowButtons); + topButtons.prepend(windowButtons); } } } else if (!isSingleToolbar && isCompactMode) { diff --git a/src/browser/base/content/browser-init-js.patch b/src/browser/base/content/browser-init-js.patch index fd66fe6e7..3d3d188ed 100644 --- a/src/browser/base/content/browser-init-js.patch +++ b/src/browser/base/content/browser-init-js.patch @@ -3,9 +3,9 @@ index 9df41bb3c82919839ee1408aa4d177ea7ee40a56..e37c64fa2c2ea39762be4285a1a70554 --- a/browser/base/content/browser-init.js +++ b/browser/base/content/browser-init.js @@ -152,13 +152,15 @@ var gBrowserInit = { - // tell CUI to ignore this element when it builds the toolbar areas - elem.setAttribute("skipintoolbarset", "true"); - } + elem.setAttribute("skipintoolbarset", "true"); + } + } + ZenCustomizableUI.init(window); for (let area of CustomizableUI.areas) { let type = CustomizableUI.getAreaType(area); @@ -16,9 +16,9 @@ index 9df41bb3c82919839ee1408aa4d177ea7ee40a56..e37c64fa2c2ea39762be4285a1a70554 } } + ZenCustomizableUI.registerToolbarNodes(window); - for (let elem of nonRemovables) { - elem.setAttribute("removable", "false"); - elem.removeAttribute("skipintoolbarset"); + if (isVerticalTabs) { + // Show the vertical tabs toolbar + setToolbarVisibility( @@ -253,6 +255,10 @@ var gBrowserInit = { gPrivateBrowsingUI.init(); BrowserSearch.init(); diff --git a/src/browser/base/content/browser-sets-js.patch b/src/browser/base/content/browser-sets-js.patch index 7b105ad22..be4f74496 100644 --- a/src/browser/base/content/browser-sets-js.patch +++ b/src/browser/base/content/browser-sets-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/browser-sets.js b/browser/base/content/browser-sets.js -index 50da6424691ca230aa1a3a419cb69e66cf47b2c4..1f63f4bb7b75c940d5482dd4f13cebf452dddb74 100644 +index 3031278749317d153624c6ccfbcc9d47aaf4089f..e67a8c3b56c01334627350c494b0139638ebf19a 100644 --- a/browser/base/content/browser-sets.js +++ b/browser/base/content/browser-sets.js @@ -245,7 +245,7 @@ document.addEventListener( @@ -7,7 +7,7 @@ index 50da6424691ca230aa1a3a419cb69e66cf47b2c4..1f63f4bb7b75c940d5482dd4f13cebf4 }); - document.getElementById("mainKeyset").addEventListener("command", event => { -+ document.getElementById(ZEN_KEYSET_ID).addEventListener("command", event => { ++ document.getElementById("zenKeyset").addEventListener("command", event => { switch (event.target.id) { case "goHome": BrowserCommands.home(); diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch index a695c621f..9dfba3614 100644 --- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch +++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml -index 12fa0cf79aade28581016adf96df85386dabdcef..85859842c85f5c131900ce49d69b117237ffc592 100644 +index eb2d8670874bd5bcaf9253caafb98444cb8cfcd9..51e6c01c279e0105ec8ac08df0763027179c0616 100644 --- a/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml @@ -2,7 +2,7 @@ @@ -8,59 +8,78 @@ index 12fa0cf79aade28581016adf96df85386dabdcef..85859842c85f5c131900ce49d69b1172 - + +