From ea286eb8a6af66d42a8bb4f7cc9ad4b576a3d772 Mon Sep 17 00:00:00 2001 From: Mauro Balades Date: Tue, 6 Aug 2024 20:13:57 +0200 Subject: [PATCH] refactor: Update ZenSidebarManager and ZenViewSplitter modules --- src/ZenSidebarManager.mjs | 2 +- src/ZenViewSplitter.mjs | 10 +++------- src/ZenWorkspaces.mjs | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/ZenSidebarManager.mjs b/src/ZenSidebarManager.mjs index cea753f..b7b3a31 100644 --- a/src/ZenSidebarManager.mjs +++ b/src/ZenSidebarManager.mjs @@ -1,7 +1,7 @@ -export var gZenBrowserManagerSidebar = { +var gZenBrowserManagerSidebar = { _sidebarElement: null, _currentPanel: null, _lastOpenedPanel: null, diff --git a/src/ZenViewSplitter.mjs b/src/ZenViewSplitter.mjs index ef295e8..469829b 100644 --- a/src/ZenViewSplitter.mjs +++ b/src/ZenViewSplitter.mjs @@ -1,5 +1,5 @@ -export var gZenViewSplitter = { +var gZenViewSplitter = { /** * [ * { @@ -16,7 +16,6 @@ export var gZenViewSplitter = { currentView: -1, init() { - Services.prefs.setBoolPref("zen.splitView.working", false); window.addEventListener("TabClose", this); this.initializeUI(); console.log("ZenViewSplitter initialized"); @@ -117,8 +116,7 @@ export var gZenViewSplitter = { this.currentView = -1; this.tabBrowserPanel.removeAttribute("zen-split-view"); this.tabBrowserPanel.style.gridTemplateAreas = ""; - this.tabBrowserPanel.style.gridGap = "0px"; - Services.prefs.setBoolPref("zen.splitView.working", false); + this.tabBrowserPanel.style.gridGap = "0px"; for (const tab of dataTab) { let container = tab.linkedBrowser.closest(".browserSidebarContainer"); container.removeAttribute("zen-split"); @@ -207,7 +205,6 @@ export var gZenViewSplitter = { } this.tabBrowserPanel.removeAttribute("zen-split-view"); this.tabBrowserPanel.style.gridTemplateAreas = ""; - Services.prefs.setBoolPref("zen.splitView.working", false); modifyDecks(this._data[this.currentView].tabs, false); // console.log("Setting the active tab to be active", gBrowser.selectedTab); gBrowser.selectedTab.linkedBrowser.docShellIsActive = true; // Make sure the active tab is active @@ -217,7 +214,6 @@ export var gZenViewSplitter = { } } this.tabBrowserPanel.setAttribute("zen-split-view", "true"); - Services.prefs.setBoolPref("zen.splitView.working", true); this.currentView = this._data.indexOf(splitData); let gridType = splitData.gridType || "grid"; // TODO: let user decide the grid type let i = 0; @@ -335,7 +331,7 @@ export var gZenViewSplitter = { } this._data[this.currentView].gridType = gridType; this._showSplitView(gBrowser.selectedTab); - panel.hidePopup(); + // panel.hidePopup(); }).bind(this, gridType)); } this.__hasSetMenuListener = true; diff --git a/src/ZenWorkspaces.mjs b/src/ZenWorkspaces.mjs index 41c6501..606836b 100644 --- a/src/ZenWorkspaces.mjs +++ b/src/ZenWorkspaces.mjs @@ -1,5 +1,5 @@ -export var ZenWorkspaces = { +var ZenWorkspaces = { async init() { let docElement = document.documentElement; if (docElement.getAttribute("chromehidden").includes("toolbar")