mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-07 21:49:58 +02:00
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
commit
48df87da98
11 changed files with 21 additions and 20 deletions
|
@ -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
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
667950575bde54b8d83db2a25ccf468522d4e0c9
|
||||
d5e5ed08dac5a263dbc7784dff272198b17bbc4f
|
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
},
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
preference="zen.pinned-tab-manager.restore-pinned-tabs-to-pinned-url"/>
|
||||
<checkbox id="zenPinnedTabContainerSpecificEssentials"
|
||||
data-l10n-id="zen-pinned-tab-manager-container-specific-essentials-enabled"
|
||||
preference="zen.workspaces.container-specific-essentials-enabled"/>
|
||||
preference="zen.workspaces.separate-essentials"/>
|
||||
|
||||
<hbox align="center">
|
||||
<label id="zenPinnedTabCloseShortcutBehaviorLabel" data-l10n-id="zen-pinned-tab-manager-close-shortcut-behavior-label"/>
|
||||
|
|
|
@ -51,6 +51,10 @@ class nsZenUIMigration {
|
|||
if (userChromeFile.exists() || userContentFile.exists()) {
|
||||
Services.prefs.setBoolPref('toolkit.legacyUserProfileCustomizations.stylesheets', true);
|
||||
}
|
||||
Services.prefs.setBoolPref(
|
||||
'zen.workspaces.separate-essentials',
|
||||
Services.prefs.getBoolPref('zen.workspaces.container-specific-essentials-enabled', false)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[DEFAULT]
|
||||
prefs = ["zen.workspaces.container-specific-essentials-enabled=true"]
|
||||
prefs = ["zen.workspaces.separate-essentials=true"]
|
||||
|
||||
["browser_container_auto_switch.js"]
|
||||
["browser_container_specific_essentials.js"]
|
|
@ -1,3 +1,5 @@
|
|||
[DEFAULT]
|
||||
prefs = ["zen.workspaces.separate-essentials=false"]
|
||||
|
||||
["browser_pinned_unload_changed.js"]
|
||||
["browser_pinned_unload_noreset.js"]
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
[DEFAULT]
|
||||
prefs = ["zen.workspaces.separate-essentials=false"]
|
||||
support-files = [
|
||||
"head.js",
|
||||
]
|
||||
|
|
|
@ -100,7 +100,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
|||
false
|
||||
);
|
||||
this.containerSpecificEssentials = Services.prefs.getBoolPref(
|
||||
'zen.workspaces.container-specific-essentials-enabled',
|
||||
'zen.workspaces.separate-essentials',
|
||||
false
|
||||
);
|
||||
ChromeUtils.defineLazyGetter(this, 'tabContainer', () =>
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
"binaryName": "zen",
|
||||
"version": {
|
||||
"product": "firefox",
|
||||
"version": "139.0.4",
|
||||
"candidate": "140.0"
|
||||
"version": "140.0.1",
|
||||
"candidate": "140.0.1"
|
||||
},
|
||||
"buildOptions": {
|
||||
"generateBranding": true
|
||||
|
@ -19,7 +19,7 @@
|
|||
"brandShortName": "Zen",
|
||||
"brandFullName": "Zen Browser",
|
||||
"release": {
|
||||
"displayVersion": "1.13.2b",
|
||||
"displayVersion": "1.14b",
|
||||
"github": {
|
||||
"repo": "zen-browser/desktop"
|
||||
},
|
||||
|
@ -39,7 +39,7 @@
|
|||
"brandShortName": "Twilight",
|
||||
"brandFullName": "Zen Twilight",
|
||||
"release": {
|
||||
"displayVersion": "1.14t",
|
||||
"displayVersion": "1.15t",
|
||||
"github": {
|
||||
"repo": "zen-browser/desktop"
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue