ZenBrowserMirrors/zen-desktop
1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-10 05:35:29 +02:00
Code Releases Wiki Activity

Add ZenWorkspacesStorage initialization and ensure waitForPromises is called

Browse source
This commit is contained in:
mr. M 2025-01-18 22:35:35 +01:00
parent 98b64e2fad
commit c9cf757964
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
5 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/browser/base/content/ZenCustomizableUI.sys.mjs
View file

@ -11,7 +11,7 @@ export var ZenCustomizableUI = new (class {
'zen-sidebar-top-buttons', 'zen-sidebar-top-buttons',
{ {
type: this.TYPE_TOOLBAR, type: this.TYPE_TOOLBAR,
defaultPlacements: [''], defaultPlacements: [],
defaultCollapsed: null, defaultCollapsed: null,
overflowable: true, overflowable: true,
}, },

1
src/browser/base/content/zen-assets.inc.xhtml
View file

@ -34,6 +34,7 @@
<script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/> <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
<script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" /> <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
<script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" /> <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" />
<script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
<script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" /> <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
<script src="chrome://browser/content/zen-components/ZenGradientGenerator.mjs" /> <script src="chrome://browser/content/zen-components/ZenGradientGenerator.mjs" />
<script src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"/> <script src="chrome://browser/content/zen-components/ZenViewSplitter.mjs"/>

1
src/browser/base/content/zen-preloaded.inc.xhtml
View file

@ -6,6 +6,5 @@
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs", this); Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenKeyboardShortcuts.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs", this); Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspaces.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesSync.mjs", this); Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesSync.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs", this);
Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenActorsManager.mjs", this); Services.scriptloader.loadSubScript("chrome://browser/content/zen-components/ZenActorsManager.mjs", this);
</script> </script>

2
src/browser/base/zen-components/ZenWorkspaces.mjs
View file

@ -71,7 +71,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
); );
ChromeUtils.defineLazyGetter(this, 'tabContainer', () => document.getElementById('tabbrowser-tabs')); ChromeUtils.defineLazyGetter(this, 'tabContainer', () => document.getElementById('tabbrowser-tabs'));
this._activeWorkspace = Services.prefs.getStringPref('zen.workspaces.active', ''); this._activeWorkspace = Services.prefs.getStringPref('zen.workspaces.active', '');
await this.waitForPromises();
this._delayedStartup(); this._delayedStartup();
} }
@ -79,6 +78,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
if (!this.workspaceEnabled) { if (!this.workspaceEnabled) {
return; return;
} }
await this.waitForPromises();
await this.initializeWorkspaces(); await this.initializeWorkspaces();
console.info('ZenWorkspaces: ZenWorkspaces initialized'); console.info('ZenWorkspaces: ZenWorkspaces initialized');

6
src/browser/base/zen-components/ZenWorkspacesStorage.mjs
View file

@ -605,4 +605,8 @@ var ZenWorkspaceBookmarksStorage = {
}, },
}; };
ZenWorkspacesStorage.init();
ZenWorkspacesStorage.promiseDBInitialized = new Promise((resolve) => {
ZenWorkspacesStorage._resolveDBInitialized = resolve;
ZenWorkspacesStorage.init();
});