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

Implement logic to close window when last tab is closed based on user preference

Browse source
This commit is contained in:
mr. M 2025-01-11 14:49:28 +01:00
parent e01af2fe97
commit 8981160627
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -415,6 +415,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
indicator.addEventListener('click', th); indicator.addEventListener('click', th);
} }
shouldCloseWindow() {
return !window.toolbar.visible || Services.prefs.getBoolPref('browser.tabs.closeWindowWithLastTab');
}
handleTabBeforeClose(tab) { handleTabBeforeClose(tab) {
if (!this.workspaceEnabled || this.__contextIsDelete) { if (!this.workspaceEnabled || this.__contextIsDelete) {
return null; return null;
@ -425,16 +429,30 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
return null; return null;
} }
// TODO: handle different actions depending on the user preference
const shouldOpenNewTabIfLastUnpinnedTabIsClosed = this.shouldOpenNewTabIfLastUnpinnedTabIsClosed;
let tabs = gBrowser.tabs.filter( let tabs = gBrowser.tabs.filter(
(t) => (t) =>
(t.getAttribute('zen-workspace-id') === workspaceID || t.hasAttribute("zen-essential")) && (t.getAttribute('zen-workspace-id') === workspaceID || t.hasAttribute('zen-essential')) &&
(!shouldOpenNewTabIfLastUnpinnedTabIsClosed || !t.pinned || t.getAttribute('pending') !== 'true') (!this.shouldOpenNewTabIfLastUnpinnedTabIsClosed || !t.pinned || t.getAttribute('pending') !== 'true')
); );
const shouldCloseWindow = this.shouldCloseWindow();
if (tabs.length === 1 && tabs[0] === tab) { if (tabs.length === 1 && tabs[0] === tab) {
if (shouldCloseWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
// so avoid calling it again:
window.skipNextCanClose = true;
// Closing the tab and replacing it with a blank one is notably slower
// than closing the window right away. If the caller opts in, take
// the fast path.
if (!gBrowser._removingTabs.size) {
// This call actually closes the window, unless the user
// cancels the operation. We are finished here in both cases.
gBrowser._windowIsClosing = window.closeWindow(true, window.warnAboutClosingWindow, 'close-last-tab');
return null;
}
return null;
}
let newTab = this._createNewTabForWorkspace({ uuid: workspaceID }); let newTab = this._createNewTabForWorkspace({ uuid: workspaceID });
return newTab; return newTab;
} }