mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-08-11 01:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Remove extra patch, b=no-bug, c=no-component

Browse Source
This commit is contained in:
Mr. M
2025-11-23 19:09:45 +01:00
parent 57233a18f6
commit 722ffa5e97
1 changed files with 68 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
src/browser/components/tabbrowser/content/tabbrowser-js.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564caba7ad06f 100644
index c0eafd4faf8d57b8486c5bf8917375850ec8147e..118194bcf51ae7cea21e268e8ccf6b9ff6eb16c8 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -386,6 +386,7 @@
@@ -140,15 +140,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
@@ -1362,6 +1426,7 @@
let newTab = this.getTabForBrowser(newBrowser);
+ newBrowser = gZenWindowSync.onTabSwitchOrWindowFocus(window, newTab);
let timerId;
if (!aForceUpdate) {
timerId = Glean.browserTabswitch.update.start();
@@ -1379,7 +1444,6 @@
@@ -1379,7 +1443,6 @@
// Preview mode should not reset the owner
if (!this._previewMode && !oldTab.selected) {
@@ -156,7 +148,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}
let lastRelatedTab = this._lastRelatedTabMap.get(oldTab);
@@ -1470,6 +1534,7 @@
@@ -1470,6 +1533,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@@ -164,7 +156,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1622,6 +1687,9 @@
@@ -1622,6 +1686,9 @@
}
let activeEl = document.activeElement;
@@ -174,7 +166,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
@@ -1945,7 +2013,8 @@
@@ -1945,7 +2012,8 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@@ -184,7 +176,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
return false;
}
@@ -2053,7 +2122,7 @@
@@ -2053,7 +2121,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@@ -193,7 +185,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (this.isTabGroupLabel(targetTab)) {
throw new Error(
"Replacing a tab group label with a tab is not supported"
@@ -2328,6 +2397,7 @@
@@ -2328,6 +2396,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@@ -201,7 +193,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
@@ -2401,8 +2471,7 @@
@@ -2401,8 +2470,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@@ -211,7 +203,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
b.setAttribute("transparent", "true");
}
@@ -2567,7 +2636,7 @@
@@ -2567,7 +2635,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@@ -220,7 +212,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
@@ -2626,8 +2695,8 @@
@@ -2626,8 +2694,8 @@
// If we transitioned from one browser to two browsers, we need to set
// hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) {
@@ -231,7 +223,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
@@ -2814,7 +2883,6 @@
@@ -2814,7 +2882,6 @@
this.selectedTab = this.addTrustedTab(BROWSER_NEW_TAB_URL, {
tabIndex: tab._tPos + 1,
userContextId: tab.userContextId,
@@ -239,7 +231,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
focusUrlBar: true,
});
resolve(this.selectedBrowser);
@@ -2923,6 +2991,8 @@
@@ -2923,6 +2990,8 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@@ -248,7 +240,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} = {}
) {
// all callers of addTab that pass a params object need to pass
@@ -2933,10 +3003,17 @@
@@ -2933,10 +3002,17 @@
);
}
@@ -266,7 +258,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// If we're opening a foreground tab, set the owner by default.
ownerTab ??= inBackground ? null : this.selectedTab;
@@ -2944,6 +3021,7 @@
@@ -2944,6 +3020,7 @@
if (this.selectedTab.owner) {
this.selectedTab.owner = null;
}
@@ -274,7 +266,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// Find the tab that opened this one, if any. This is used for
// determining positioning, and inherited attributes such as the
@@ -2996,6 +3074,19 @@
@@ -2996,6 +3073,19 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -294,7 +286,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (insertTab) {
// Insert the tab into the tab container in the correct position.
this.#insertTabAtIndex(t, {
@@ -3004,6 +3095,7 @@
@@ -3004,6 +3094,7 @@
ownerTab,
openerTab,
pinned,
@@ -302,7 +294,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
bulkOrderedOpen,
tabGroup: tabGroup ?? openerTab?.group,
});
@@ -3022,6 +3114,7 @@
@@ -3022,6 +3113,7 @@
openWindowInfo,
skipLoad,
triggeringRemoteType,
@@ -310,7 +302,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}));
if (focusUrlBar) {
@@ -3146,6 +3239,12 @@
@@ -3146,6 +3238,12 @@
}
}
@@ -323,7 +315,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// Additionally send pinned tab events
if (pinned) {
this.#notifyPinnedStatus(t);
@@ -3330,10 +3429,10 @@
@@ -3330,10 +3428,10 @@
isAdoptingGroup = false,
isUserTriggered = false,
telemetryUserCreateSource = "unknown",
@@ -335,7 +327,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}
if (!color) {
@@ -3354,9 +3453,14 @@
@@ -3354,9 +3452,14 @@
label,
isAdoptingGroup
);
@@ -352,7 +344,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
);
group.addTabs(tabs);
@@ -3477,7 +3581,7 @@
@@ -3477,7 +3580,7 @@
}
this.#handleTabMove(tab, () =>
@@ -361,7 +353,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
);
}
@@ -3679,6 +3783,7 @@
@@ -3679,6 +3782,7 @@
openWindowInfo,
skipLoad,
triggeringRemoteType,
@@ -369,7 +361,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}
) {
// If we don't have a preferred remote type (or it is `NOT_REMOTE`), and
@@ -3748,6 +3853,7 @@
@@ -3748,6 +3852,7 @@
openWindowInfo,
name,
skipLoad,
@@ -377,7 +369,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
});
}
@@ -3935,7 +4041,7 @@
@@ -3935,7 +4040,7 @@
// Add a new tab if needed.
if (!tab) {
let createLazyBrowser =
@@ -386,7 +378,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
let url = "about:blank";
if (tabData.entries?.length) {
@@ -3972,8 +4078,10 @@
@@ -3972,8 +4077,10 @@
insertTab: false,
skipLoad: true,
preferredRemoteType,
@@ -398,7 +390,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (select) {
tabToSelect = tab;
}
@@ -3985,7 +4093,8 @@
@@ -3985,7 +4092,8 @@
this.pinTab(tab);
// Then ensure all the tab open/pinning information is sent.
this._fireTabOpen(tab, {});
@@ -408,7 +400,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
@@ -3999,7 +4108,10 @@
@@ -3999,7 +4107,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@@ -420,7 +412,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
);
tabsFragment.appendChild(tabGroup.node);
}
@@ -4044,9 +4156,23 @@
@@ -4044,9 +4155,23 @@
// to remove the old selected tab.
if (tabToSelect) {
let leftoverTab = this.selectedTab;
@@ -444,7 +436,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
@@ -4237,11 +4363,14 @@
@@ -4237,11 +4362,14 @@
if (ownerTab) {
tab.owner = ownerTab;
}
@@ -460,7 +452,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (
!bulkOrderedOpen &&
((openerTab &&
@@ -4253,7 +4382,7 @@
@@ -4253,7 +4381,7 @@
let lastRelatedTab =
openerTab && this._lastRelatedTabMap.get(openerTab);
let previousTab = lastRelatedTab || openerTab || this.selectedTab;
@@ -469,7 +461,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
tabGroup = previousTab.group;
}
if (
@@ -4264,7 +4393,7 @@
@@ -4264,7 +4392,7 @@
) {
elementIndex = Infinity;
} else if (previousTab.visible) {
@@ -478,7 +470,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} else if (previousTab == FirefoxViewHandler.tab) {
elementIndex = 0;
}
@@ -4292,14 +4421,14 @@
@@ -4292,14 +4420,14 @@
}
// Ensure index is within bounds.
if (tab.pinned) {
@@ -497,7 +489,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (pinned && !itemAfter?.pinned) {
itemAfter = null;
@@ -4310,7 +4439,7 @@
@@ -4310,7 +4438,7 @@
this.tabContainer._invalidateCachedTabs();
@@ -506,7 +498,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (this.isTab(itemAfter) && itemAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, itemAfter);
@@ -4338,7 +4467,11 @@
@@ -4338,7 +4466,11 @@
const tabContainer = pinned
? this.tabContainer.pinnedTabsContainer
: this.tabContainer;
@@ -518,7 +510,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}
this._updateTabsAfterInsert();
@@ -4346,6 +4479,7 @@
@@ -4346,6 +4478,7 @@
if (pinned) {
this._updateTabBarForPinnedTabs();
}
@@ -526,7 +518,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
TabBarVisibility.update();
}
@@ -4896,6 +5030,7 @@
@@ -4896,6 +5029,7 @@
telemetrySource,
} = {}
) {
@@ -534,7 +526,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// When 'closeWindowWithLastTab' pref is enabled, closing all tabs
// can be considered equivalent to closing the window.
if (
@@ -4985,6 +5120,7 @@
@@ -4985,6 +5119,7 @@
if (lastToClose) {
this.removeTab(lastToClose, aParams);
}
@@ -542,7 +534,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} catch (e) {
console.error(e);
}
@@ -5023,6 +5159,12 @@
@@ -5023,6 +5158,12 @@
aTab._closeTimeNoAnimTimerId = Glean.browserTabclose.timeNoAnim.start();
}
@@ -555,7 +547,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -5037,6 +5179,9 @@
@@ -5037,6 +5178,9 @@
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
let isLastTab = this.#isLastTabInWindow(aTab);
@@ -565,7 +557,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
@@ -5085,7 +5230,13 @@
@@ -5085,7 +5229,13 @@
// We're not animating, so we can cancel the animation stopwatch.
Glean.browserTabclose.timeAnim.cancel(aTab._closeTimeAnimTimerId);
aTab._closeTimeAnimTimerId = null;
@@ -580,7 +572,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
return;
}
@@ -5219,7 +5370,7 @@
@@ -5219,7 +5369,7 @@
closeWindowWithLastTab != null
? closeWindowWithLastTab
: !window.toolbar.visible ||
@@ -589,7 +581,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -5243,6 +5394,7 @@
@@ -5243,6 +5393,7 @@
newTab = true;
}
@@ -597,7 +589,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -5283,13 +5435,7 @@
@@ -5283,13 +5434,7 @@
aTab._mouseleave();
if (newTab) {
@@ -612,7 +604,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} else {
TabBarVisibility.update();
}
@@ -5422,6 +5568,7 @@
@@ -5422,6 +5567,7 @@
this.tabs[i]._tPos = i;
}
@@ -620,7 +612,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (!this._windowIsClosing) {
// update tab close buttons state
this.tabContainer._updateCloseButtons();
@@ -5643,6 +5790,7 @@
@@ -5643,6 +5789,7 @@
}
let excludeTabs = new Set(aExcludeTabs);
@@ -628,7 +620,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// If this tab has a successor, it should be selectable, since
// hiding or closing a tab removes that tab as a successor.
@@ -5655,13 +5803,13 @@
@@ -5655,13 +5802,13 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@@ -644,7 +636,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
);
let tab = this.tabContainer.findNextTab(aTab, {
@@ -5677,7 +5825,7 @@
@@ -5677,7 +5824,7 @@
}
if (tab) {
@@ -653,7 +645,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5698,7 +5846,7 @@
@@ -5698,7 +5845,7 @@
});
}
@@ -662,7 +654,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}
_blurTab(aTab) {
@@ -5709,7 +5857,7 @@
@@ -5709,7 +5856,7 @@
* @returns {boolean}
* False if swapping isn't permitted, true otherwise.
*/
@@ -671,7 +663,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// Do not allow transfering a private tab to a non-private window
// and vice versa.
if (
@@ -5763,6 +5911,7 @@
@@ -5763,6 +5910,7 @@
// fire the beforeunload event in the process. Close the other
// window if this was its last tab.
if (
@@ -679,7 +671,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
!remoteBrowser._beginRemoveTab(aOtherTab, {
adoptedByTab: aOurTab,
closeWindowWithLastTab: true,
@@ -5774,7 +5923,7 @@
@@ -5774,7 +5922,7 @@
// If this is the last tab of the window, hide the window
// immediately without animation before the docshell swap, to avoid
// about:blank being painted.
@@ -688,7 +680,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (closeWindow) {
let win = aOtherTab.ownerGlobal;
win.windowUtils.suppressAnimation(true);
@@ -5898,11 +6047,13 @@
@@ -5898,11 +6046,13 @@
}
// Finish tearing down the tab that's going away.
@@ -702,7 +694,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
this.setTabTitle(aOurTab);
@@ -6104,10 +6251,10 @@
@@ -6104,10 +6250,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -715,7 +707,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -6166,6 +6313,7 @@
@@ -6166,6 +6312,7 @@
* @param {MozTabbrowserTab|MozTabbrowserTabGroup|MozTabbrowserTabGroup.labelElement} aTab
*/
replaceTabWithWindow(aTab, aOptions) {
@@ -723,7 +715,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (this.tabs.length == 1) {
return null;
}
@@ -6299,7 +6447,7 @@
@@ -6299,7 +6446,7 @@
* `true` if element is a `<tab-group>`
*/
isTabGroup(element) {
@@ -732,7 +724,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
}
/**
@@ -6375,8 +6523,8 @@
@@ -6375,8 +6522,8 @@
}
// Don't allow mixing pinned and unpinned tabs.
@@ -743,7 +735,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} else {
tabIndex = Math.max(tabIndex, this.pinnedTabCount);
}
@@ -6402,10 +6550,16 @@
@@ -6402,10 +6549,16 @@
this.#handleTabMove(
element,
() => {
@@ -762,7 +754,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
if (neighbor && this.isTab(element) && tabIndex > element._tPos) {
neighbor.after(element);
} else {
@@ -6463,23 +6617,28 @@
@@ -6463,23 +6616,28 @@
#moveTabNextTo(element, targetElement, moveBefore = false, metricsContext) {
if (this.isTabGroupLabel(targetElement)) {
targetElement = targetElement.group;
@@ -797,7 +789,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} else if (!element.pinned && targetElement && targetElement.pinned) {
// If the caller asks to move an unpinned element next to a pinned
// tab, move the unpinned element to be the first unpinned element
@@ -6492,14 +6651,34 @@
@@ -6492,14 +6650,34 @@
// move the tab group right before the first unpinned tab.
// 4. Moving a tab group and the first unpinned tab is grouped:
// move the tab group right before the first unpinned tab's tab group.
@@ -833,7 +825,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
element.pinned
? this.tabContainer.pinnedTabsContainer
: this.tabContainer;
@@ -6508,7 +6687,7 @@
@@ -6508,7 +6686,7 @@
element,
() => {
if (moveBefore) {
@@ -842,7 +834,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
} else if (targetElement) {
targetElement.after(element);
} else {
@@ -6580,10 +6759,10 @@
@@ -6580,10 +6758,10 @@
* @param {TabMetricsContext} [metricsContext]
*/
moveTabToGroup(aTab, aGroup, metricsContext) {
@@ -855,7 +847,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
@@ -6613,6 +6792,7 @@
@@ -6613,6 +6791,7 @@
let state = {
tabIndex: tab._tPos,
@@ -863,7 +855,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
};
if (tab.visible) {
state.elementIndex = tab.elementIndex;
@@ -6639,7 +6819,7 @@
@@ -6639,7 +6818,7 @@
let changedTabGroup =
previousTabState.tabGroupId != currentTabState.tabGroupId;
@@ -872,7 +864,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
tab.dispatchEvent(
new CustomEvent("TabMove", {
bubbles: true,
@@ -6676,6 +6856,10 @@
@@ -6676,6 +6855,10 @@
moveActionCallback();
@@ -883,7 +875,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
@@ -7576,7 +7760,7 @@
@@ -7576,7 +7759,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@@ -892,7 +884,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
window.focus();
aEvent.preventDefault();
break;
@@ -7593,7 +7777,6 @@
@@ -7593,7 +7776,6 @@
}
case "TabGroupCollapse":
aEvent.target.tabs.forEach(tab => {
@@ -900,7 +892,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
});
break;
case "TabGroupCreateByUser":
@@ -8542,6 +8725,7 @@
@@ -8542,6 +8724,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -908,7 +900,7 @@ index c0eafd4faf8d57b8486c5bf8917375850ec8147e..f0a779b987e07d80f47975a8204564ca
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
@@ -9543,7 +9727,7 @@ var TabContextMenu = {
@@ -9543,7 +9726,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;