mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-10-06 01:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated to firefox RC 135.0

Browse Source
This commit is contained in:
mr. m
2025-01-28 16:27:56 +01:00
parent 1c59a6d461
commit a408449e2c
14 changed files with 135 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,9 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce8043469f4ff655 100644
index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..87e68c2a0663a3da3e6d86277ce2f0c58f6765cc 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -409,11 +409,39 @@
return count;
@@ -406,11 +406,39 @@
return this.tabContainer.visibleTabs;
}
+ get _numVisiblePinTabs() {
@@ -44,7 +44,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
}
return i;
}
@@ -806,7 +834,7 @@
@@ -807,7 +835,7 @@
this.showTab(aTab);
if (this.tabContainer.verticalMode) {
this._handleTabMove(aTab, () =>
@@ -52,8 +52,8 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
+ aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.appendChild(aTab)
);
} else {
this.moveTabTo(aTab, this.pinnedTabCount);
@@ -1052,6 +1080,8 @@
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
@@ -1055,6 +1083,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -62,7 +62,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
if (
aIconURL &&
!aLoadingPrincipal &&
@@ -1062,6 +1092,9 @@
@@ -1065,6 +1095,9 @@
);
return;
}
@@ -72,7 +72,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
@@ -1291,6 +1324,7 @@
@@ -1310,6 +1343,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@@ -80,7 +80,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -2374,7 +2408,7 @@
@@ -2387,7 +2421,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@@ -89,7 +89,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
@@ -2434,7 +2468,7 @@
@@ -2447,7 +2481,7 @@
// hasSiblings=false on both the existing browser and the new browser.
if (this.tabs.length == 2) {
this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
@@ -98,7 +98,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
@@ -2666,6 +2700,12 @@
@@ -2679,6 +2713,12 @@
);
}
@@ -111,7 +111,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
@@ -2735,6 +2775,12 @@
@@ -2742,6 +2782,12 @@
noInitialLabel,
skipBackgroundNotify,
});
@@ -124,7 +124,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
@@ -2878,6 +2924,13 @@
@@ -2885,6 +2931,13 @@
}
}
@@ -138,7 +138,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
@@ -3389,6 +3442,23 @@
@@ -3403,6 +3456,23 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@@ -162,7 +162,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
@@ -3402,6 +3472,9 @@
@@ -3416,6 +3486,9 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@@ -172,7 +172,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
@@ -3438,6 +3511,21 @@
@@ -3452,6 +3525,21 @@
preferredRemoteType,
});
@@ -194,7 +194,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
if (select) {
tabToSelect = tab;
}
@@ -3491,7 +3579,6 @@
@@ -3505,7 +3593,6 @@
this.tabContainer._invalidateCachedTabs();
}
}
@@ -202,7 +202,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
tab.initialize();
}
@@ -4070,6 +4157,10 @@
@@ -4095,6 +4182,10 @@
return;
}
@@ -213,7 +213,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
this.removeTabs(selectedTabs);
}
@@ -4389,6 +4480,13 @@
@@ -4443,6 +4534,13 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@@ -227,7 +227,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -4417,7 +4515,10 @@
@@ -4471,7 +4569,10 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@@ -239,7 +239,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
@@ -4556,14 +4657,14 @@
@@ -4610,14 +4711,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@@ -256,7 +256,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -5411,10 +5512,10 @@
@@ -5465,10 +5566,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@@ -269,7 +269,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -7384,6 +7485,7 @@
@@ -7443,6 +7544,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@@ -277,7 +277,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
gBrowser.syncThrobberAnimations(this.mTab);
@@ -8344,7 +8446,7 @@ var TabContextMenu = {
@@ -8411,7 +8513,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !multiselectionContext;
@@ -286,7 +286,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
@@ -8378,7 +8480,7 @@ var TabContextMenu = {
@@ -8444,7 +8546,7 @@ var TabContextMenu = {
let contextMoveTabToStart = document.getElementById("context_moveToStart");
let isFirstTab =
tabsToMove[0] == visibleTabs[0] ||
@@ -295,7 +295,7 @@ index ce68c339f35416574b7bc7ebf8c93378f653242b..e01b690e5df5f828909c204dce804346
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
@@ -8607,6 +8709,7 @@ var TabContextMenu = {
@@ -8677,6 +8779,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {

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

@@ -1,17 +1,17 @@
diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c08b06e884 100644
index 8aeb244ffca9f48661805f5b7d860b5896055562..5d49a40b35b2bc4ea2c9b8423bde07508326eaca 100644
--- a/browser/components/tabbrowser/content/tabs.js
+++ b/browser/components/tabbrowser/content/tabs.js
@@ -94,7 +94,7 @@
return this.hasAttribute("positionpinnedtabs");
};
this.arrowScrollbox._canScrollToElement = tab => {
- return (!tab.pinned || !arePositioningPinnedTabs()) && tab.visible;
+ return (!tab.hasAttribute("zen-essential") || !arePositioningPinnedTabs()) && tab.visible;
this.arrowScrollbox._canScrollToElement = element => {
if (isTab(element)) {
- return !element.pinned || !this.hasAttribute("positionpinnedtabs");
+ return !tab.hasAttribute("zen-essential") || !this.hasAttribute("positionpinnedtabs");
}
return true;
};
// Override for performance reasons. This is the size of a single element
@@ -352,7 +352,7 @@
@@ -362,7 +362,7 @@
// and we're not hitting the scroll buttons.
if (
event.button != 0 ||
@@ -20,7 +20,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
event.composedTarget.localName == "toolbarbutton"
) {
return;
@@ -649,7 +649,7 @@
@@ -659,7 +659,7 @@
if (this.#isContainerVerticalPinnedExpanded(tab)) {
// In expanded vertical mode, the max number of pinned tabs per row is dynamic
// Set this before adjusting dragged tab's position
@@ -29,7 +29,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
let tabsPerRow = 0;
let position = 0;
for (let pinnedTab of pinnedTabs) {
@@ -997,7 +997,7 @@
@@ -1010,7 +1010,7 @@
}
} else {
let pinned = draggedTab.pinned;
@@ -38,7 +38,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
let tabs = this.visibleTabs.slice(
pinned ? 0 : numPinned,
pinned ? numPinned : undefined
@@ -1076,7 +1076,7 @@
@@ -1090,7 +1090,7 @@
let postTransitionCleanup = () => {
tab.removeAttribute("tabdrop-samewindow");
@@ -46,8 +46,8 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
+ this._finishAnimateTabMove(true);
if (dropIndex !== false) {
gBrowser.moveTabTo(tab, dropIndex);
if (incrementDropIndex) {
@@ -1086,7 +1086,7 @@
if (!directionForward) {
@@ -1100,7 +1100,7 @@
gBrowser.syncThrobberAnimations(tab);
};
@@ -56,7 +56,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
postTransitionCleanup();
} else {
let onTransitionEnd = transitionendEvent => {
@@ -1238,7 +1238,8 @@
@@ -1263,7 +1263,8 @@
if (
dt.mozUserCancelled ||
dt.dropEffect != "none" ||
@@ -66,7 +66,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
) {
delete draggedTab._dragData;
return;
@@ -1487,7 +1488,7 @@
@@ -1512,7 +1513,7 @@
}
this.#allTabs = [
@@ -75,7 +75,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
...children,
];
return this.#allTabs;
@@ -1556,6 +1557,7 @@
@@ -1593,6 +1594,7 @@
}
this.#focusableItems = [
@@ -83,7 +83,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
...verticalPinnedTabsContainer.children,
...focusableItems,
];
@@ -1579,8 +1581,8 @@
@@ -1617,8 +1619,8 @@
#isContainerVerticalPinnedExpanded(tab) {
return (
this.verticalMode &&
@@ -94,7 +94,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
);
}
@@ -1778,7 +1780,7 @@
@@ -1816,7 +1818,7 @@
let rect = ele => {
return window.windowUtils.getBoundsWithoutFlushing(ele);
};
@@ -103,7 +103,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
if (tab && rect(tab).width <= this._tabClipWidth) {
this.setAttribute("closebuttons", "activetab");
} else {
@@ -1794,6 +1796,7 @@
@@ -1832,6 +1834,7 @@
this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
}
@@ -111,7 +111,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
selectedTab._notselectedsinceload = false;
}
@@ -1841,7 +1844,7 @@
@@ -1879,7 +1882,7 @@
if (isEndTab && !this._hasTabTempMaxWidth) {
return;
}
@@ -120,7 +120,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
// Force tabs to stay the same width, unless we're closing the last tab,
// which case we need to let them expand just enough so that the overall
// tabbar width is the same.
@@ -1856,7 +1859,7 @@
@@ -1894,7 +1897,7 @@
let tabsToReset = [];
for (let i = numPinned; i < tabs.length; i++) {
let tab = tabs[i];
@@ -129,7 +129,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
if (!isEndTab) {
// keep tabs the same width
tab.style.transition = "none";
@@ -1922,13 +1925,13 @@
@@ -1963,13 +1966,13 @@
let verticalTabsContainer = document.getElementById(
"vertical-pinned-tabs-container"
);
@@ -146,7 +146,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
}
}
@@ -1952,7 +1955,7 @@
@@ -1993,7 +1996,7 @@
_positionPinnedTabs() {
let tabs = this.visibleTabs;
@@ -155,7 +155,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
let absPositionHorizontalTabs =
this.overflowing && tabs.length > numPinned && numPinned > 0;
@@ -2033,7 +2036,7 @@
@@ -2074,7 +2077,7 @@
return;
}
@@ -164,7 +164,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
let directionX = screenX > dragData.animLastScreenX;
let directionY = screenY > dragData.animLastScreenY;
@@ -2221,9 +2224,9 @@
@@ -2257,9 +2260,9 @@
}
let pinned = draggedTab.pinned;
@@ -176,7 +176,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
pinned ? numPinned : undefined
);
@@ -2456,8 +2459,8 @@
@@ -2502,8 +2505,8 @@
);
}
@@ -187,7 +187,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
return;
}
@@ -2622,9 +2625,9 @@
@@ -2668,9 +2671,9 @@
function newIndex(aTab, index) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@@ -199,7 +199,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
}
}
@@ -2708,7 +2711,7 @@
@@ -2754,7 +2757,7 @@
}
_notifyBackgroundTab(aTab) {
@@ -208,7 +208,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
return;
}
@@ -2726,12 +2729,14 @@
@@ -2772,12 +2775,14 @@
selectedTab = {
left: selectedTab.left,
right: selectedTab.right,
@@ -224,7 +224,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
selectedTab,
];
})
@@ -2748,8 +2753,11 @@
@@ -2794,8 +2799,11 @@
delete this._lastTabToScrollIntoView;
// Is the new tab already completely visible?
if (
@@ -238,7 +238,7 @@ index f7c39fe804182e2bdf53045ba3b6a5ba17079fc3..15b9e83426ead9efcbe6d2b72f3f00c0
) {
return;
}
@@ -2757,21 +2765,29 @@
@@ -2803,21 +2811,29 @@
if (this.arrowScrollbox.smoothScroll) {
// Can we make both the new tab and the selected tab completely visible?
if (