mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/zen-browser/desktop into dev

Browse Source
This commit is contained in:
Mr. M
2025-05-05 19:44:39 +02:00
parent 3b4c2f6d76 4c02f76187
commit 54d5a747ba
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/browser/components/sessionstore/SessionStore-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
index 5633e5032f5d50c70512187d27e045b579978927..34bc7a07a3b47a1571760b7a4b2b006772daff3c 100644
index 5633e5032f5d50c70512187d27e045b579978927..724fe7ec3bb6058c006f25b1d9ee0ce10f7b2e36 100644
--- a/browser/components/sessionstore/SessionStore.sys.mjs
+++ b/browser/components/sessionstore/SessionStore.sys.mjs
@@ -2081,7 +2081,6 @@ var SessionStoreInternal = {
@@ -10,7 +10,7 @@ index 5633e5032f5d50c70512187d27e045b579978927..34bc7a07a3b47a1571760b7a4b2b0067
!lazy.SessionStartup.willRestore()
) {
// We want to split the window up into pinned tabs and unpinned tabs.
@@ -2296,12 +2295,10 @@ var SessionStoreInternal = {
@@ -2296,11 +2295,9 @@ var SessionStoreInternal = {
tabbrowser.selectedTab.label;
}
@@ -19,11 +19,9 @@ index 5633e5032f5d50c70512187d27e045b579978927..34bc7a07a3b47a1571760b7a4b2b0067
// of closing windows to quit.
winData._shouldRestore = true;
- }
-
+
// Store the window's close date to figure out when each individual tab
// was closed. This timestamp should allow re-arranging data based on how
// recently something was closed.
@@ -3202,7 +3199,7 @@ var SessionStoreInternal = {
if (!isPrivateWindow && tabState.isPrivate) {
return;

4
src/zen/mods/actors/ZenThemeMarketplaceChild.sys.mjs
View File

@@ -51,7 +51,7 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild {
initiateThemeMarketplace() {
this.contentWindow.setTimeout(() => {
this.addInstallButtons();
this.injectMarkplaceAPI();
this.injectMarketplaceAPI();
}, 0);
}
@@ -105,7 +105,7 @@ export class ZenThemeMarketplaceChild extends JSWindowActorChild {
}
}
injectMarkplaceAPI() {
injectMarketplaceAPI() {
Cu.exportFunction(this.installTheme.bind(this), this.contentWindow, {
defineAs: 'ZenInstallTheme',
});