diff --git a/README.md b/README.md index 9b344a2a..b23dca1c 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,8 @@ Zen is a firefox-based browser with the aim of pushing your productivity to a ne ### Firefox Versions -- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `139.0.4`! 🚀 -- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0`! +- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `140.0.1`! 🚀 +- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 140.0.1`! ### Contributing diff --git a/build/firefox-cache/l10n-last-commit-hash b/build/firefox-cache/l10n-last-commit-hash index 95e73b02..a77d8f54 100644 --- a/build/firefox-cache/l10n-last-commit-hash +++ b/build/firefox-cache/l10n-last-commit-hash @@ -1 +1 @@ -667950575bde54b8d83db2a25ccf468522d4e0c9 \ No newline at end of file +d5e5ed08dac5a263dbc7784dff272198b17bbc4f \ No newline at end of file diff --git a/src/browser/app/profile/features/workspaces.inc b/src/browser/app/profile/features/workspaces.inc index 117158f8..2d954863 100644 --- a/src/browser/app/profile/features/workspaces.inc +++ b/src/browser/app/profile/features/workspaces.inc @@ -11,7 +11,7 @@ pref('zen.workspaces.wrap-around-navigation', true); pref('zen.workspaces.natural-scroll', false); pref('zen.workspaces.scroll-modifier-key','ctrl'); // can be ctrl, alt, shift, or a meta key pref('services.sync.engine.workspaces', false); -pref('zen.workspaces.container-specific-essentials-enabled', false); +pref('zen.workspaces.separate-essentials', true); #ifdef MOZILLA_OFFICIAL pref('zen.workspaces.debug', false); diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index 1579b56f..09bbf767 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -742,19 +742,13 @@ var gZenWorkspacesSettings = { }; Services.prefs.addObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener); Services.prefs.addObserver('zen.glance.enabled', tabsUnloaderPrefListener); // We can use the same listener for both prefs - Services.prefs.addObserver( - 'zen.workspaces.container-specific-essentials-enabled', - tabsUnloaderPrefListener - ); + Services.prefs.addObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener); Services.prefs.addObserver('zen.glance.activation-method', tabsUnloaderPrefListener); window.addEventListener('unload', () => { Services.prefs.removeObserver('zen.tab-unloader.enabled', tabsUnloaderPrefListener); Services.prefs.removeObserver('zen.glance.enabled', tabsUnloaderPrefListener); Services.prefs.removeObserver('zen.glance.activation-method', tabsUnloaderPrefListener); - Services.prefs.removeObserver( - 'zen.workspaces.container-specific-essentials-enabled', - tabsUnloaderPrefListener - ); + Services.prefs.removeObserver('zen.workspaces.separate-essentials', tabsUnloaderPrefListener); }); }, }; @@ -1153,7 +1147,7 @@ Preferences.addAll([ default: true, }, { - id: 'zen.workspaces.container-specific-essentials-enabled', + id: 'zen.workspaces.separate-essentials', type: 'bool', default: false, }, diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml index 5ee4a810..46a921c8 100644 --- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml +++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml @@ -47,7 +47,7 @@ preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/> + preference="zen.workspaces.separate-essentials"/>