LeMoonStar/zen-realigned
1
0
Fork 0
forked from ZenBrowserMirrors/zen-desktop
Code Pull requests Activity

Removed flatpak artifacts once build and commits has been done

Browse source
This commit is contained in:
mr. m 2025-02-25 17:53:43 +01:00
parent d536f3e93c
commit cf6ed8c382
No known key found for this signature in database
GPG key ID: 419302196C23B258
3 changed files with 59 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

97
src/browser/components/tabbrowser/content/tabbrowser-js.patch
View file

@ -1,8 +1,8 @@
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0576f9489 100644
index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..20c92611723587e4eeed5889b2b1741d86368263 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -406,11 +406,37 @@
@@ -406,11 +406,50 @@
return this.tabContainer.visibleTabs;
}
@ -29,6 +29,19 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
+ }
+ return i;
+ }
+
+ get _numZenVisibleEssentials() {
+ let i = 0;
+ for (let tab of this.tabs) {
+ if (!tab.hasAttribute("zen-essential") && !tab.hasAttribute("zen-glance-tab")) {
+ break;
+ }
+ if (!tab.hidden) {
+ i += !tab.hasAttribute("zen-glance-tab");
+ }
+ }
+ return i;
+ }
+
get pinnedTabCount() {
- for (var i = 0; i < this.tabs.length; i++) {
@ -42,7 +55,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
}
return i;
}
@@ -807,7 +833,7 @@
@@ -807,7 +846,7 @@
this.showTab(aTab);
if (this.tabContainer.verticalMode) {
this._handleTabMove(aTab, () =>
@ -51,7 +64,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
);
} else {
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
@@ -828,7 +854,7 @@
@@ -828,7 +867,7 @@
// the moving of a tab from the vertical pinned tabs container
// and back into arrowscrollbox.
aTab.removeAttribute("pinned");
@ -60,7 +73,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
});
} else {
this.moveTabTo(aTab, this.pinnedTabCount - 1, {
@@ -1055,6 +1081,8 @@
@@ -1055,6 +1094,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@ -69,7 +82,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (
aIconURL &&
!aLoadingPrincipal &&
@@ -1065,6 +1093,9 @@
@@ -1065,6 +1106,9 @@
);
return;
}
@ -79,7 +92,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
@@ -1310,6 +1341,7 @@
@@ -1310,6 +1354,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@ -87,7 +100,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1462,6 +1494,9 @@
@@ -1462,6 +1507,9 @@
}
let activeEl = document.activeElement;
@ -97,7 +110,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
@@ -1785,7 +1820,7 @@
@@ -1785,7 +1833,7 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@ -106,7 +119,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
return false;
}
@@ -1888,7 +1923,7 @@
@@ -1888,7 +1936,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@ -115,7 +128,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
let browser;
if (targetTab) {
browser = this.getBrowserForTab(targetTab);
@@ -2222,7 +2257,8 @@
@@ -2222,7 +2270,8 @@
b.setAttribute("name", name);
}
@ -125,7 +138,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
b.setAttribute("transparent", "true");
}
@@ -2387,7 +2423,7 @@
@@ -2387,7 +2436,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@ -134,7 +147,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
@@ -2446,8 +2482,8 @@
@@ -2446,8 +2495,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) {
@ -145,7 +158,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
@@ -2679,6 +2715,12 @@
@@ -2679,6 +2728,12 @@
);
}
@ -158,7 +171,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
@@ -2742,6 +2784,12 @@
@@ -2742,6 +2797,12 @@
noInitialLabel,
skipBackgroundNotify,
});
@ -171,7 +184,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
@@ -2885,6 +2933,9 @@
@@ -2885,6 +2946,9 @@
}
}
@ -181,7 +194,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
@@ -3403,6 +3454,24 @@
@@ -3403,6 +3467,24 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@ -206,7 +219,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
@@ -3416,6 +3485,7 @@
@@ -3416,6 +3498,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@ -214,7 +227,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
@@ -3451,7 +3521,24 @@
@@ -3451,7 +3534,24 @@
skipLoad: true,
preferredRemoteType,
});
@ -240,7 +253,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (select) {
tabToSelect = tab;
}
@@ -3464,8 +3551,8 @@
@@ -3464,8 +3564,8 @@
// inserted in the DOM. If the tab is not yet in the DOM,
// just insert it in the right place from the start.
if (!tab.parentNode) {
@ -251,7 +264,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
@@ -3729,7 +3816,7 @@
@@ -3729,7 +3829,7 @@
// Ensure we have an index if one was not provided.
if (typeof index != "number") {
// Move the new tab after another tab if needed, to the end otherwise.
@ -260,7 +273,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (
!bulkOrderedOpen &&
((openerTab &&
@@ -3780,7 +3867,7 @@
@@ -3780,7 +3880,7 @@
}
/** @type {MozTabbrowserTab|undefined} */
@ -269,7 +282,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
this.tabContainer._invalidateCachedTabs();
if (tabGroup) {
@@ -4095,6 +4182,9 @@
@@ -4095,6 +4195,9 @@
return;
}
@ -279,7 +292,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
this.removeTabs(selectedTabs);
}
@@ -4427,6 +4517,7 @@
@@ -4427,6 +4530,7 @@
skipSessionStore,
} = {}
) {
@ -287,7 +300,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
@@ -4443,6 +4534,12 @@
@@ -4443,6 +4547,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@ -300,7 +313,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -4457,7 +4554,9 @@
@@ -4457,7 +4567,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@ -311,7 +324,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
@@ -4471,7 +4570,6 @@
@@ -4471,7 +4583,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@ -319,7 +332,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
@@ -4610,14 +4708,14 @@
@@ -4610,14 +4721,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@ -336,7 +349,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -4641,6 +4739,7 @@
@@ -4641,6 +4752,7 @@
newTab = true;
}
@ -344,7 +357,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -4681,9 +4780,7 @@
@@ -4681,9 +4793,7 @@
aTab._mouseleave();
if (newTab) {
@ -355,7 +368,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
} else {
TabBarVisibility.update();
}
@@ -4812,6 +4909,8 @@
@@ -4812,6 +4922,8 @@
this.tabs[i]._tPos = i;
}
@ -364,7 +377,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
@@ -5025,7 +5124,7 @@
@@ -5025,7 +5137,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@ -373,7 +386,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
}
// Try to find a remaining tab that comes after the given tab
@@ -5047,7 +5146,7 @@
@@ -5047,7 +5159,7 @@
}
if (tab) {
@ -382,7 +395,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5465,10 +5564,10 @@
@@ -5465,10 +5577,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@ -395,16 +408,16 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -5706,7 +5805,7 @@
@@ -5706,7 +5818,7 @@
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
- aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
+ aIndex = aTab.hasAttribute('zen-essential') ? Math.min(aIndex, this._numZenEssentials) : Math.min(aIndex, this.pinnedTabCount - 1);
+ aIndex = aTab.hasAttribute('zen-essential') ? Math.min(aIndex, this._numZenEssentials - 1) : Math.min(aIndex, this.pinnedTabCount - 1);
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
@@ -5717,7 +5816,7 @@
@@ -5717,7 +5829,7 @@
this._lastRelatedTabMap = new WeakMap();
this._handleTabMove(aTab, () => {
@ -413,7 +426,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (forceStandaloneTab && neighbor.group) {
neighbor = neighbor.group;
}
@@ -5802,7 +5901,7 @@
@@ -5802,7 +5914,7 @@
createLazyBrowser,
};
@ -422,7 +435,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
@@ -7443,6 +7542,7 @@
@@ -7443,6 +7555,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@ -430,7 +443,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
gBrowser.syncThrobberAnimations(this.mTab);
@@ -8411,7 +8511,7 @@ var TabContextMenu = {
@@ -8411,7 +8524,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !multiselectionContext;
@ -439,7 +452,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
@@ -8444,7 +8544,7 @@ var TabContextMenu = {
@@ -8444,7 +8557,7 @@ var TabContextMenu = {
let contextMoveTabToStart = document.getElementById("context_moveToStart");
let isFirstTab =
tabsToMove[0] == visibleTabs[0] ||
@ -448,7 +461,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..52d963bb0840075881501497692674c0
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
@@ -8677,6 +8777,7 @@ var TabContextMenu = {
@@ -8677,6 +8790,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {