mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-05 19:08:18 +00:00
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
@@ -664,7 +664,7 @@
|
||||
type: 'spring',
|
||||
}
|
||||
);
|
||||
gZenViewSplitter.deactivateCurrentSplitView();
|
||||
gZenViewSplitter.deactivateCurrentSplitView({ removeDeckSelected: true });
|
||||
this.finishOpeningGlance();
|
||||
}
|
||||
|
||||
|
@@ -1142,12 +1142,12 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
|
||||
/**
|
||||
* Deactivates the split view.
|
||||
*/
|
||||
deactivateCurrentSplitView() {
|
||||
deactivateCurrentSplitView({ removeDeckSelected = false } = {}) {
|
||||
if (this.currentView < 0) return;
|
||||
this.setTabsDocShellState(this._data[this.currentView].tabs, false);
|
||||
for (const tab of this._data[this.currentView].tabs) {
|
||||
const container = tab.linkedBrowser.closest('.browserSidebarContainer');
|
||||
this.resetContainerStyle(container);
|
||||
this.resetContainerStyle(container, removeDeckSelected);
|
||||
}
|
||||
this.removeSplitters();
|
||||
this.tabBrowserPanel.removeAttribute('zen-split-view');
|
||||
@@ -1496,10 +1496,14 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
|
||||
* Resets the container style.
|
||||
*
|
||||
* @param {Element} container - The container element.
|
||||
* @param {boolean} [removeDeckSelected=false] - Whether to remove the 'deck-selected' attribute.
|
||||
*/
|
||||
resetContainerStyle(container) {
|
||||
resetContainerStyle(container, removeDeckSelected = false) {
|
||||
container.removeAttribute('zen-split');
|
||||
container.style.inset = '';
|
||||
if (removeDeckSelected) {
|
||||
container.classList.remove('deck-selected');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user