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

fix: add missing newline at end of surfer.json

Browse source
This commit is contained in:
mr. m 2025-03-26 23:41:42 +01:00
parent c3e33fa7f3
commit baafa12967
No known key found for this signature in database
GPG key ID: 419302196C23B258
2 changed files with 55 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

109
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 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd8851844e982 100644
index 5f406ea5d09273c9b70b84eee24c6267f88692f8..fd0756885990f9da34390603d13fd8851844e982 100644
--- a/browser/components/tabbrowser/content/tabbrowser.js
+++ b/browser/components/tabbrowser/content/tabbrowser.js
@@ -424,11 +424,50 @@
@ -63,11 +63,10 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
tab.linkedPanel = uniqueId;
this._selectedTab = tab;
this._selectedBrowser = browser;
@@ -823,12 +863,13 @@
@@ -823,11 +863,13 @@
}
this.showTab(aTab);
- this.ungroupTab(aTab);
- if (this.tabContainer.verticalMode) {
+ const handled = gZenFolders.handleTabPin(aTab);
+ if (!handled) this.ungroupTab(aTab);
@ -81,7 +80,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
}
aTab.setAttribute("pinned", "true");
@@ -842,12 +883,15 @@
@@ -841,12 +883,15 @@
}
if (this.tabContainer.verticalMode) {
@ -98,7 +97,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
});
} else {
this.moveTabTo(aTab, this.pinnedTabCount - 1, {
@@ -1030,6 +1074,8 @@
@@ -1029,6 +1074,8 @@
let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@ -107,7 +106,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (
aIconURL &&
!aLoadingPrincipal &&
@@ -1040,6 +1086,9 @@
@@ -1039,6 +1086,9 @@
);
return;
}
@ -117,7 +116,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let browser = this.getBrowserForTab(aTab);
browser.mIconURL = aIconURL;
@@ -1288,6 +1337,7 @@
@@ -1287,6 +1337,7 @@
if (!this._previewMode) {
newTab.recordTimeFromUnloadToReload();
newTab.updateLastAccessed();
@ -125,7 +124,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
oldTab.updateLastAccessed();
// if this is the foreground window, update the last-seen timestamps.
if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
@@ -1440,6 +1490,9 @@
@@ -1439,6 +1490,9 @@
}
let activeEl = document.activeElement;
@ -135,7 +134,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// If focus is on the old tab, move it to the new tab.
if (activeEl == oldTab) {
newTab.focus();
@@ -1763,7 +1816,7 @@
@@ -1762,7 +1816,7 @@
}
_setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
@ -144,7 +143,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
return false;
}
@@ -1866,7 +1919,7 @@
@@ -1865,7 +1919,7 @@
newIndex = this.selectedTab._tPos + 1;
}
@ -153,7 +152,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let browser;
if (targetTab) {
browser = this.getBrowserForTab(targetTab);
@@ -2123,6 +2176,7 @@
@@ -2122,6 +2176,7 @@
uriIsAboutBlank,
userContextId,
skipLoad,
@ -161,7 +160,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} = {}) {
let b = document.createXULElement("browser");
// Use the JSM global to create the permanentKey, so that if the
@@ -2196,8 +2250,7 @@
@@ -2195,8 +2250,7 @@
// we use a different attribute name for this?
b.setAttribute("name", name);
}
@ -171,7 +170,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
b.setAttribute("transparent", "true");
}
@@ -2374,7 +2427,7 @@
@@ -2373,7 +2427,7 @@
let panel = this.getPanel(browser);
let uniqueId = this._generateUniquePanelID();
@ -180,7 +179,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
aTab.linkedPanel = uniqueId;
// Inject the <browser> into the DOM if necessary.
@@ -2433,8 +2486,8 @@
@@ -2432,8 +2486,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) {
@ -191,7 +190,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} else {
aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
}
@@ -2656,6 +2709,7 @@
@@ -2655,6 +2709,7 @@
schemelessInput,
hasValidUserGestureActivation = false,
textDirectiveUserActivation = false,
@ -199,7 +198,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} = {}
) {
// all callers of addTab that pass a params object need to pass
@@ -2666,6 +2720,12 @@
@@ -2665,6 +2720,12 @@
);
}
@ -212,7 +211,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (!UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.start("browser.tabs.opening", "initting", window);
}
@@ -2729,6 +2789,15 @@
@@ -2728,6 +2789,15 @@
noInitialLabel,
skipBackgroundNotify,
});
@ -228,7 +227,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (insertTab) {
// insert the tab into the tab container in the correct position
this._insertTabAtIndex(t, {
@@ -2753,6 +2822,7 @@
@@ -2752,6 +2822,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@ -236,7 +235,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}));
if (focusUrlBar) {
@@ -2872,6 +2942,9 @@
@@ -2871,6 +2942,9 @@
}
}
@ -246,7 +245,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Additionally send pinned tab events
if (pinned) {
this._notifyPinnedStatus(t);
@@ -2892,12 +2965,15 @@
@@ -2891,12 +2965,15 @@
* @param {string} [label=]
* @returns {MozTabbrowserTabGroup}
*/
@ -263,7 +262,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
return group;
}
@@ -2938,6 +3014,7 @@
@@ -2937,6 +3014,7 @@
insertBefore = null,
isUserCreated = false,
telemetryUserCreateSource = "unknown",
@ -271,7 +270,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} = {}
) {
if (!tabs?.length) {
@@ -2952,7 +3029,12 @@
@@ -2951,7 +3029,12 @@
id = `${Date.now()}-${Math.round(Math.random() * 100)}`;
}
let group = this._createTabGroup(id, color, false, label);
@ -285,7 +284,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
group,
insertBefore?.group ?? insertBefore
);
@@ -3269,6 +3351,7 @@
@@ -3268,6 +3351,7 @@
initialBrowsingContextGroupId,
openWindowInfo,
skipLoad,
@ -293,7 +292,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}
) {
// If we don't have a preferred remote type, and we have a remote
@@ -3332,6 +3415,7 @@
@@ -3331,6 +3415,7 @@
openWindowInfo,
name,
skipLoad,
@ -301,7 +300,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
});
}
@@ -3510,6 +3594,27 @@
@@ -3509,6 +3594,27 @@
) {
tabWasReused = true;
tab = this.selectedTab;
@ -329,7 +328,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (!tabData.pinned) {
this.unpinTab(tab);
} else {
@@ -3523,6 +3628,7 @@
@@ -3522,6 +3628,7 @@
restoreTabsLazily && !select && !tabData.pinned;
let url = "about:blank";
@ -337,7 +336,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (tabData.entries?.length) {
let activeIndex = (tabData.index || tabData.entries.length) - 1;
// Ensure the index is in bounds.
@@ -3558,7 +3664,27 @@
@@ -3557,7 +3664,27 @@
skipLoad: true,
preferredRemoteType,
});
@ -366,7 +365,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (select) {
tabToSelect = tab;
}
@@ -3571,8 +3697,8 @@
@@ -3570,8 +3697,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) {
@ -377,7 +376,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
tab.toggleAttribute("pinned", true);
this.tabContainer._invalidateCachedTabs();
// Then ensure all the tab open/pinning information is sent.
@@ -3582,7 +3708,8 @@
@@ -3581,7 +3708,8 @@
// needs calling:
shouldUpdateForPinnedTabs = true;
}
@ -387,7 +386,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let { groupId } = tabData;
const tabGroup = tabGroupWorkingData.get(groupId);
// if a tab refers to a tab group we don't know, skip any group
@@ -3596,7 +3723,10 @@
@@ -3595,7 +3723,10 @@
tabGroup.stateData.id,
tabGroup.stateData.color,
tabGroup.stateData.collapsed,
@ -399,7 +398,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
);
tabsFragment.appendChild(tabGroup.node);
}
@@ -3647,6 +3777,9 @@
@@ -3646,6 +3777,9 @@
this.selectedTab = tabToSelect;
this.removeTab(leftoverTab);
}
@ -409,7 +408,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (tabs.length > 1 || !tabs[0].selected) {
this._updateTabsAfterInsert();
@@ -3831,7 +3964,7 @@
@@ -3830,7 +3964,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.
@ -418,7 +417,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (
!bulkOrderedOpen &&
((openerTab &&
@@ -3877,18 +4010,18 @@
@@ -3876,18 +4010,18 @@
// Ensure index is within bounds.
if (tab.pinned) {
@ -441,7 +440,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (tabAfter && tabAfter.group == tabGroup) {
// Place at the front of, or between tabs in, the same tab group
this.tabContainer.insertBefore(tab, tabAfter);
@@ -4200,6 +4333,9 @@
@@ -4199,6 +4333,9 @@
return;
}
@ -451,7 +450,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
this.removeTabs(selectedTabs);
}
@@ -4557,6 +4693,7 @@
@@ -4556,6 +4693,7 @@
skipSessionStore,
} = {}
) {
@ -459,7 +458,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (UserInteraction.running("browser.tabs.opening", window)) {
UserInteraction.finish("browser.tabs.opening", window);
}
@@ -4573,6 +4710,12 @@
@@ -4572,6 +4710,12 @@
TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
}
@ -472,7 +471,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Handle requests for synchronously removing an already
// asynchronously closing tab.
if (!animate && aTab.closing) {
@@ -4587,7 +4730,9 @@
@@ -4586,7 +4730,9 @@
// frame created for it (for example, by updating the visually selected
// state).
let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@ -483,7 +482,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (
!this._beginRemoveTab(aTab, {
closeWindowFastpath: true,
@@ -4601,7 +4746,6 @@
@@ -4600,7 +4746,6 @@
TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
return;
}
@ -491,7 +490,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
let lockTabSizing =
!this.tabContainer.verticalMode &&
!aTab.pinned &&
@@ -4740,14 +4884,14 @@
@@ -4739,14 +4884,14 @@
!!this.tabsInCollapsedTabGroups.length;
if (
aTab.visible &&
@ -508,7 +507,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (closeWindow) {
// We've already called beforeunload on all the relevant tabs if we get here,
@@ -4771,6 +4915,7 @@
@@ -4770,6 +4915,7 @@
newTab = true;
}
@ -516,7 +515,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
aTab._endRemoveArgs = [closeWindow, newTab];
// swapBrowsersAndCloseOther will take care of closing the window without animation.
@@ -4811,9 +4956,7 @@
@@ -4810,9 +4956,7 @@
aTab._mouseleave();
if (newTab) {
@ -527,7 +526,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} else {
TabBarVisibility.update();
}
@@ -4942,6 +5085,8 @@
@@ -4941,6 +5085,8 @@
this.tabs[i]._tPos = i;
}
@ -536,7 +535,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (!this._windowIsClosing) {
if (wasPinned) {
this.tabContainer._positionPinnedTabs();
@@ -5160,7 +5305,7 @@
@@ -5159,7 +5305,7 @@
!excludeTabs.has(aTab.owner) &&
Services.prefs.getBoolPref("browser.tabs.selectOwnerOnClose")
) {
@ -545,7 +544,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}
// Try to find a remaining tab that comes after the given tab
@@ -5182,7 +5327,7 @@
@@ -5181,7 +5327,7 @@
}
if (tab) {
@ -554,7 +553,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
}
// If no qualifying visible tab was found, see if there is a tab in
@@ -5600,10 +5745,10 @@
@@ -5599,10 +5745,10 @@
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
}
@ -567,7 +566,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
aTab.selected ||
aTab.closing ||
// Tabs that are sharing the screen, microphone or camera cannot be hidden.
@@ -5839,7 +5984,7 @@
@@ -5838,7 +5984,7 @@
moveTabTo(aTab, aIndex, { forceStandaloneTab = false } = {}) {
// Don't allow mixing pinned and unpinned tabs.
if (aTab.pinned) {
@ -576,7 +575,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
} else {
aIndex = Math.max(aIndex, this.pinnedTabCount);
}
@@ -5849,10 +5994,17 @@
@@ -5848,10 +5994,17 @@
this.#handleTabMove(aTab, () => {
let neighbor = this.tabs[aIndex];
@ -596,7 +595,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
neighbor.after(aTab);
} else {
this.tabContainer.insertBefore(aTab, neighbor);
@@ -5938,7 +6090,7 @@
@@ -5937,7 +6090,7 @@
}
moveTabToGroup(aTab, aGroup) {
@ -605,7 +604,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
return;
}
if (aTab.group && aTab.group.id === aGroup.id) {
@@ -5962,6 +6114,10 @@
@@ -5961,6 +6114,10 @@
moveActionCallback();
@ -616,7 +615,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Clear tabs cache after moving nodes because the order of tabs may have
// changed.
this.tabContainer._invalidateCachedTabs();
@@ -6016,7 +6172,7 @@
@@ -6015,7 +6172,7 @@
createLazyBrowser,
};
@ -625,7 +624,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
params.pinned = true;
}
@@ -6766,7 +6922,7 @@
@@ -6765,7 +6922,7 @@
// preventDefault(). It will still raise the window if appropriate.
break;
}
@ -634,7 +633,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
window.focus();
aEvent.preventDefault();
break;
@@ -7672,6 +7828,7 @@
@@ -7671,6 +7828,7 @@
aWebProgress.isTopLevel
) {
this.mTab.setAttribute("busy", "true");
@ -642,7 +641,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
gBrowser._tabAttrModified(this.mTab, ["busy"]);
this.mTab._notselectedsinceload = !this.mTab.selected;
}
@@ -8641,7 +8798,7 @@ var TabContextMenu = {
@@ -8640,7 +8798,7 @@ var TabContextMenu = {
);
contextUnpinSelectedTabs.hidden =
!this.contextTab.pinned || !this.multiselected;
@ -651,7 +650,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
// Move Tab items
let contextMoveTabOptions = document.getElementById(
"context_moveTabOptions"
@@ -8675,7 +8832,7 @@ var TabContextMenu = {
@@ -8674,7 +8832,7 @@ var TabContextMenu = {
let isFirstTab =
!this.contextTabs[0].group &&
(this.contextTabs[0] == visibleTabs[0] ||
@ -660,7 +659,7 @@ index 0dc763824f390b4964489ac4e071ed6d41cc41db..fd0756885990f9da34390603d13fd885
contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
document.getElementById("context_openTabInWindow").disabled =
@@ -8905,6 +9062,7 @@ var TabContextMenu = {
@@ -8904,6 +9062,7 @@ var TabContextMenu = {
if (this.contextTab.multiselected) {
gBrowser.removeMultiSelectedTabs();
} else {