refactor: Simplify workspace initialization logic

This commit is contained in:
mauro-balades 2024-09-04 19:01:37 +02:00
parent 06134b02e0
commit 82824a1716

View file

@ -9,10 +9,10 @@ var ZenWorkspaces = {
return; // We are in a hidden window, don't initialize ZenWorkspaces return; // We are in a hidden window, don't initialize ZenWorkspaces
} }
console.info("ZenWorkspaces: Initializing ZenWorkspaces..."); console.info("ZenWorkspaces: Initializing ZenWorkspaces...");
setTimeout(async () => { window.SessionStore.promiseInitialized.then(async () => {
await this.initializeWorkspaces(); await this.initializeWorkspaces();
console.info("ZenWorkspaces: ZenWorkspaces initialized"); console.info("ZenWorkspaces: ZenWorkspaces initialized");
}, 0); })
}, },
get workspaceEnabled() { get workspaceEnabled() {
@ -50,8 +50,10 @@ var ZenWorkspaces = {
} }
}, },
async initializeWorkspaces() { async initializeWorkspaces(init = false) {
if (init) {
Services.prefs.addObserver("zen.workspaces.enabled", this.onWorkspacesEnabledChanged.bind(this)); Services.prefs.addObserver("zen.workspaces.enabled", this.onWorkspacesEnabledChanged.bind(this));
}
this.initializeWorkspacesButton(); this.initializeWorkspacesButton();
let file = new FileUtils.File(this._storeFile); let file = new FileUtils.File(this._storeFile);
if (!file.exists()) { if (!file.exists()) {
@ -76,10 +78,12 @@ var ZenWorkspaces = {
} }
this.changeWorkspace(activeWorkspace, true); this.changeWorkspace(activeWorkspace, true);
} }
if (init) {
this._initializeWorkspaceCreationIcons(); this._initializeWorkspaceCreationIcons();
this._initializeWorkspaceEditIcons(); this._initializeWorkspaceEditIcons();
this._initializeWorkspaceTabContextMenus(); this._initializeWorkspaceTabContextMenus();
} }
}
}, },
handleTabClose(event) { handleTabClose(event) {