diff --git a/src/browser/base/content/zen-components b/src/browser/base/content/zen-components index 76f4f80a7..208e14726 160000 --- a/src/browser/base/content/zen-components +++ b/src/browser/base/content/zen-components @@ -1 +1 @@ -Subproject commit 76f4f80a75699e6a15d7524265f9843b2d7ad94e +Subproject commit 208e14726445d22936ebdf215f7e6f347e5e1cde diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch index 37b1412f2..f6adc58c8 100644 --- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch +++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch @@ -1,5 +1,5 @@ diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js -index 14de79b543cf07b04d06ef5a3f94d9aa988ea39a..fe626dc19c9abaf4f9736ec6bcc8cf7d44bbdc10 100644 +index 14de79b543cf07b04d06ef5a3f94d9aa988ea39a..0c2623dff576b48086a0f26ea588e76720cbc664 100644 --- a/browser/components/tabbrowser/content/tabbrowser.js +++ b/browser/components/tabbrowser/content/tabbrowser.js @@ -462,11 +462,26 @@ @@ -140,7 +140,18 @@ index 14de79b543cf07b04d06ef5a3f94d9aa988ea39a..fe626dc19c9abaf4f9736ec6bcc8cf7d // Handle requests for synchronously removing an already // asynchronously closing tab. if (!animate && aTab.closing) { -@@ -5123,10 +5171,10 @@ +@@ -4163,6 +4211,10 @@ + // state). + let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width; + ++ if (aTab.hasAttribute("zen-glance-tab")) { ++ gZenGlanceManager.closeGlance(); ++ return; ++ } + if ( + !this._beginRemoveTab(aTab, { + closeWindowFastpath: true, +@@ -5123,10 +5175,10 @@ SessionStore.deleteCustomTabValue(aTab, "hiddenBy"); }, @@ -153,7 +164,7 @@ index 14de79b543cf07b04d06ef5a3f94d9aa988ea39a..fe626dc19c9abaf4f9736ec6bcc8cf7d aTab.selected || aTab.closing || // Tabs that are sharing the screen, microphone or camera cannot be hidden. -@@ -7042,6 +7090,7 @@ +@@ -7042,6 +7094,7 @@ aWebProgress.isTopLevel ) { this.mTab.setAttribute("busy", "true"); @@ -161,7 +172,7 @@ index 14de79b543cf07b04d06ef5a3f94d9aa988ea39a..fe626dc19c9abaf4f9736ec6bcc8cf7d gBrowser._tabAttrModified(this.mTab, ["busy"]); this.mTab._notselectedsinceload = !this.mTab.selected; gBrowser.syncThrobberAnimations(this.mTab); -@@ -7874,7 +7923,7 @@ var TabContextMenu = { +@@ -7874,7 +7927,7 @@ var TabContextMenu = { ); contextUnpinSelectedTabs.hidden = !this.contextTab.pinned || !multiselectionContext;