Skip to content

Commit 5787c7d

Browse files
committed
fix: Fixed expanding glance while on a split view, b=no-bug, c=no-component
1 parent 1518ea7 commit 5787c7d

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

src/browser/components/tabbrowser/content/tabbrowser-js.patch

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
2-
index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a92b6a07d6 100644
2+
index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..1033da146ef5a3463f9fb15168060424b64a64ab 100644
33
--- a/browser/components/tabbrowser/content/tabbrowser.js
44
+++ b/browser/components/tabbrowser/content/tabbrowser.js
55
@@ -422,15 +422,49 @@
@@ -364,10 +364,10 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
364364
+ gZenWorkspaces._initialTab._shouldRemove = true;
365365
+ }
366366
+ }
367-
}
367+
+ }
368368
+ else {
369369
+ gZenWorkspaces._tabToRemoveForEmpty = this.selectedTab;
370-
+ }
370+
}
371371
+ this._hasAlreadyInitializedZenSessionStore = true;
372372

373373
if (tabs.length > 1 || !tabs[0].selected) {
@@ -612,10 +612,13 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
612612
element = element.group;
613613
if (targetElement?.group) {
614614
targetElement = targetElement.group;
615-
@@ -6130,8 +6260,12 @@
615+
@@ -6130,8 +6260,15 @@
616616
}
617617

618618
// Don't allow mixing pinned and unpinned tabs.
619+
+ if (targetElement.group?.hasAttribute("split-view-group")) {
620+
+ targetElement = targetElement.group;
621+
+ }
619622
+ targetElement = gZenGlanceManager.getTabOrGlanceParent(targetElement);
620623
+ if (element.hasAttribute('zen-essential') && !targetElement?.hasAttribute('zen-essential')) {
621624
+ targetElement = this.tabsWithoutGlance[this._numZenEssentials - 1];
@@ -626,7 +629,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
626629
moveBefore = false;
627630
} else if (!element.pinned && targetElement && targetElement.pinned) {
628631
// If the caller asks to move an unpinned element next to a pinned
629-
@@ -6145,7 +6279,7 @@
632+
@@ -6145,7 +6282,7 @@
630633
// move the tab group right before the first unpinned tab.
631634
// 4. Moving a tab group and the first unpinned tab is grouped:
632635
// move the tab group right before the first unpinned tab's tab group.
@@ -635,15 +638,15 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
635638
if (targetElement.group) {
636639
targetElement = targetElement.group;
637640
}
638-
@@ -6153,6 +6287,7 @@
641+
@@ -6153,6 +6290,7 @@
639642
}
640643

641644
let getContainer = () =>
642645
+ element.hasAttribute("zen-essential") ? gZenWorkspaces.getEssentialsSection(element) :
643646
element.pinned
644647
? this.tabContainer.pinnedTabsContainer
645648
: this.tabContainer;
646-
@@ -6210,7 +6345,7 @@
649+
@@ -6210,7 +6348,7 @@
647650
if (!this.isTab(aTab)) {
648651
throw new Error("Can only move a tab into a tab group");
649652
}
@@ -652,7 +655,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
652655
return;
653656
}
654657
if (aTab.group && aTab.group.id === aGroup.id) {
655-
@@ -6304,6 +6439,10 @@
658+
@@ -6304,6 +6442,10 @@
656659

657660
moveActionCallback();
658661

@@ -663,7 +666,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
663666
// Clear tabs cache after moving nodes because the order of tabs may have
664667
// changed.
665668
this.tabContainer._invalidateCachedTabs();
666-
@@ -7198,7 +7337,7 @@
669+
@@ -7198,7 +7340,7 @@
667670
// preventDefault(). It will still raise the window if appropriate.
668671
break;
669672
}
@@ -672,15 +675,15 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
672675
window.focus();
673676
aEvent.preventDefault();
674677
break;
675-
@@ -8143,6 +8282,7 @@
678+
@@ -8143,6 +8285,7 @@
676679
aWebProgress.isTopLevel
677680
) {
678681
this.mTab.setAttribute("busy", "true");
679682
+ if (!this.mTab.selected) this.mTab.setAttribute("unread", "true");
680683
gBrowser._tabAttrModified(this.mTab, ["busy"]);
681684
this.mTab._notselectedsinceload = !this.mTab.selected;
682685
}
683-
@@ -9108,7 +9248,7 @@ var TabContextMenu = {
686+
@@ -9108,7 +9251,7 @@ var TabContextMenu = {
684687
);
685688
contextUnpinSelectedTabs.hidden =
686689
!this.contextTab.pinned || !this.multiselected;
@@ -689,7 +692,7 @@ index 96fd8acdc09cc4c9649d1ed7503c2a0bde536613..87fb109037d13183e76184201de600a9
689692
// Move Tab items
690693
let contextMoveTabOptions = document.getElementById(
691694
"context_moveTabOptions"
692-
@@ -9384,6 +9524,7 @@ var TabContextMenu = {
695+
@@ -9384,6 +9527,7 @@ var TabContextMenu = {
693696
)
694697
);
695698
} else {

0 commit comments

Comments
 (0)