Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Commit 8aa6e6d

Browse files
authored
Update to firefox 113.0 (#252)
1 parent 603993a commit 8aa6e6d

17 files changed

+91
-147
lines changed

gluon.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"binaryName": "pulse-browser",
66
"version": {
77
"product": "firefox",
8-
"version": "112.0"
8+
"version": "113.0.1"
99
},
1010
"buildOptions": {
1111
"generateBranding": true
@@ -99,4 +99,4 @@
9999
"licenseType": "MPL-2.0"
100100
},
101101
"updateHostname": "updates.pulsebrowser.app"
102-
}
102+
}
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
2-
index 81f4d49068c285049d49db6c8fc5c0fbe042ff6b..39ef13fb66567c31ebf932d7a6f528fa1d635069 100644
2+
index 56c8022ec4bbeda70e09c3b8780afcbf21ba0579..4d637ea6263799f9574ac23f0c8900949540dfec 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
5-
@@ -2804,3 +2804,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0);
6-
pref("browser.swipe.navigation-icon-min-radius", 12);
7-
pref("browser.swipe.navigation-icon-max-radius", 20);
5+
@@ -2837,3 +2837,5 @@ pref("cookiebanners.ui.desktop.cfrVariant", 0);
6+
#ifdef MOZ_ARTIFACT_BUILDS
7+
pref("telemetry.fog.artifact_build", true);
88
#endif
99
+
1010
+#include pulse-browser.js

src/browser/app/profile/pulse-browser.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,10 @@ pref("app.releaseNotesURL.aboutDialog", "https://discord.gg/Y3khyEtAgS");
9292

9393
// This pref needs to be here to not break context menus (GH#169)
9494
pref("extensions.pocket.enabled", false);
95+
96+
// Reenable accessability. Should have a low enough performance impact with the
97+
// changes in 113
98+
// 0: auto-detect
99+
// 1: force disable
100+
// -1: force enable
101+
pref('accessibility.force_disabled', 0);

src/browser/base/content/browser-sidebar-js.patch

Lines changed: 32 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/browser-sidebar.js b/browser/base/content/browser-sidebar.js
2-
index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e492783860a67c28 100644
2+
index d2b36db203f6572c39cc9a68cc71e4f7e2af0f07..738502d7c0dd9336a48270249818861dcdff9c1a 100644
33
--- a/browser/base/content/browser-sidebar.js
44
+++ b/browser/base/content/browser-sidebar.js
55
@@ -11,6 +11,9 @@ var SidebarUI = {
@@ -74,17 +74,17 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
7474
]));
7575
},
7676

77-
@@ -63,6 +98,10 @@ var SidebarUI = {
77+
@@ -62,6 +97,10 @@ var SidebarUI = {
78+
},
7879
POSITION_START_PREF: "sidebar.position_start",
7980
DEFAULT_SIDEBAR_ID: "viewBookmarksSidebar",
80-
81+
+
8182
+ SIDEBAR_KEEP_TABS_ACTIVE_PREF: "pulse.sidebar.keeptabsactive.enabled",
8283
+ SIDEBAR_TABS_PREF: "pulse.sidebar.enabled",
8384
+ SIDEBAR_EXTENSIONS_PREF: "pulse.sidebar.extensions.enabled",
84-
+
85+
8586
// lastOpenedId is set in show() but unlike currentID it's not cleared out on hide
8687
// and isn't persisted across windows
87-
lastOpenedId: null,
8888
@@ -83,6 +122,15 @@ var SidebarUI = {
8989
_switcherArrow: null,
9090
_inited: false,
@@ -101,7 +101,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
101101
/**
102102
* @type {MutationObserver | null}
103103
*/
104-
@@ -112,20 +160,80 @@ var SidebarUI = {
104+
@@ -112,20 +160,79 @@ var SidebarUI = {
105105
this.toggleSwitcherPanel();
106106
});
107107

@@ -176,14 +176,13 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
176176
if (!enumerator.hasMoreElements()) {
177177
let xulStore = Services.xulStore;
178178
- xulStore.persist(this._box, "sidebarcommand");
179-
+
180179
+ if (!this._keepTabsActivePref) {
181180
+ xulStore.persist(this._box, "sidebarcommand");
182181
+ }
183182

184183
if (this._box.hasAttribute("positionend")) {
185184
xulStore.persist(this._box, "positionend");
186-
@@ -157,7 +265,7 @@ var SidebarUI = {
185+
@@ -157,7 +264,7 @@ var SidebarUI = {
187186
/**
188187
* The handler for Services.obs.addObserver.
189188
**/
@@ -192,7 +191,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
192191
switch (topic) {
193192
case "intl:app-locales-changed": {
194193
if (this.isOpen) {
195-
@@ -168,6 +276,54 @@ var SidebarUI = {
194+
@@ -168,6 +275,54 @@ var SidebarUI = {
196195
this.showInitially(this.lastOpenedId);
197196
break;
198197
}
@@ -247,16 +246,16 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
247246
}
248247
}
249248
},
250-
@@ -284,17 +440,32 @@ var SidebarUI = {
249+
@@ -284,17 +439,32 @@ var SidebarUI = {
251250
// First reset all ordinals to match DOM ordering.
252251
let browser = document.getElementById("browser");
253252
[...browser.children].forEach((node, i) => {
254253
+ // Do not change ordinal on vertical tabs
255254
+ if (node.id == "TabsToolbar" || node.id == "verticaltabs-splitter") {
256255
+ return;
257256
+ }
258-
+
259-
node.style.MozBoxOrdinalGroup = i + 1;
257+
+
258+
node.style.order = i + 1;
260259
});
261260

262261
if (!this._positionStart) {
@@ -271,21 +270,21 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
271270
+
272271
+ // sidebar-container and appcontent
273272
let appcontent = document.getElementById("appcontent");
274-
- let boxOrdinal = this._box.style.MozBoxOrdinalGroup;
275-
- this._box.style.MozBoxOrdinalGroup = appcontent.style.MozBoxOrdinalGroup;
276-
+ let boxOrdinal = this._sidebarTabs.style.MozBoxOrdinalGroup;
277-
+ this._sidebarTabs.style.MozBoxOrdinalGroup =
278-
+ appcontent.style.MozBoxOrdinalGroup;
279-
appcontent.style.MozBoxOrdinalGroup = boxOrdinal;
273+
- let boxOrdinal = this._box.style.order;
274+
- this._box.style.order = appcontent.style.order;
275+
+ let boxOrdinal = this._sidebarTabs.style.order;
276+
+ this._sidebarTabs.style.order = appcontent.style.order;
277+
appcontent.style.order = boxOrdinal;
280278
+
281279
+ // splitter and sidebar-box
282-
+ const splitterBoxOrdinal = this._splitter.style.MozBoxOrdinalGroup;
283-
+ this._splitter.style.MozBoxOrdinalGroup = this._box.style.MozBoxOrdinalGroup;
284-
+ this._box.style.MozBoxOrdinalGroup = splitterBoxOrdinal;
280+
+ const splitterBoxOrdinal = this._splitter.style.order;
281+
+ this._splitter.style.order = this._box.style.order;
282+
+ this._box.style.order = splitterBoxOrdinal;
283+
+
285284
// Indicate we've switched ordering to the box
286285
this._box.setAttribute("positionend", true);
287286
} else {
288-
@@ -483,6 +654,10 @@ var SidebarUI = {
287+
@@ -483,6 +653,10 @@ var SidebarUI = {
289288
},
290289

291290
_loadSidebarExtension(commandID) {
@@ -296,23 +295,23 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
296295
let sidebar = this.sidebars.get(commandID);
297296
let { extensionId } = sidebar;
298297
if (extensionId) {
299-
@@ -521,6 +696,7 @@ var SidebarUI = {
298+
@@ -521,6 +695,7 @@ var SidebarUI = {
300299
}
301300

302301
this._fireFocusedEvent();
303302
+ this.loadedSidebars.push(commandID);
304303
return true;
305304
});
306305
},
307-
@@ -544,6 +720,7 @@ var SidebarUI = {
306+
@@ -544,6 +719,7 @@ var SidebarUI = {
308307
}
309308
return this._show(commandID).then(() => {
310309
this._loadSidebarExtension(commandID);
311310
+ this.loadedSidebars.push(commandID);
312311
return true;
313312
});
314313
},
315-
@@ -557,6 +734,38 @@ var SidebarUI = {
314+
@@ -557,6 +733,38 @@ var SidebarUI = {
316315
*/
317316
_show(commandID) {
318317
return new Promise(resolve => {
@@ -347,11 +346,11 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
347346
+ browser.setAttribute("hidden", "true");
348347
+ }
349348
+ }
350-
+
349+
+
351350
this.selectMenuItem(commandID);
352351

353352
this._box.hidden = this._splitter.hidden = false;
354-
@@ -574,7 +783,13 @@ var SidebarUI = {
353+
@@ -574,7 +782,13 @@ var SidebarUI = {
355354
this.observeTitleChanges(sourceL10nEl);
356355
this.browser.setAttribute("src", url); // kick off async load
357356

@@ -366,29 +365,25 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
366365
this.browser.addEventListener(
367366
"load",
368367
event => {
369-
@@ -618,12 +833,19 @@ var SidebarUI = {
368+
@@ -618,11 +832,14 @@ var SidebarUI = {
370369
// create a new content viewer because the old one doesn't get destroyed
371370
// until about:blank has loaded (which does not happen as long as the
372371
// element is hidden).
373372
- this.browser.setAttribute("src", "about:blank");
374373
- this.browser.docShell.createAboutBlankContentViewer(null, null);
374+
-
375375
+ if (!this._keepTabsActivePref) {
376376
+ this.browser.setAttribute("src", "about:blank");
377377
+ this.browser.docShell.createAboutBlankContentViewer(null, null);
378378
+ }
379-
379+
+
380380
this._box.removeAttribute("checked");
381381
this._box.hidden = this._splitter.hidden = true;
382382
+ this._sidebarIcons.removeAttribute("checked");
383383

384-
+ // Note: This was was commented out but had no description for its removed
385-
+ // reason. I am bringing it back unless there is any other justification - tricky
386-
+ //
387-
+ // Removed in: :mute: Remove Test Logs
388384
let selBrowser = gBrowser.selectedBrowser;
389385
selBrowser.focus();
390-
if (triggerNode) {
391-
@@ -636,10 +858,27 @@ var SidebarUI = {
386+
@@ -636,10 +853,28 @@ var SidebarUI = {
392387
* none if the argument is an empty string.
393388
*/
394389
selectMenuItem(commandID) {
@@ -405,6 +400,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
405400
- let triggerbutton =
406401
+ let dropdownTriggerButton =
407402
triggerButtonId && document.getElementById(triggerButtonId);
403+
+
408404
+ const sidebarTriggerButton = document.getElementById(
409405
+ `sidebar-background-${id}`
410406
+ );
@@ -417,7 +413,7 @@ index 22c886b09373a38a4fbceb6d279a58f276675d63..ebc355c651fb48b9d6e7fc88e4927838
417413
if (id == commandID) {
418414
menu.setAttribute("checked", "true");
419415
if (triggerbutton) {
420-
@@ -655,6 +894,107 @@ var SidebarUI = {
416+
@@ -655,6 +890,107 @@ var SidebarUI = {
421417
}
422418
}
423419
},

src/browser/base/content/browser-verticaltabs.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,11 +157,11 @@ var VerticalTabs = {
157157
'class',
158158
'chromeclass-extrachrome verticaltabs-splitter'
159159
)
160-
separator.setAttribute('resizebefore', 'none')
161-
separator.setAttribute('resizeafter', 'sibling')
160+
separator.setAttribute('resizebefore', 'sibling')
161+
separator.setAttribute('resizeafter', 'none')
162162

163163
const tabs = this.tabsToolbar
164-
if (tabs) tabs.parentElement?.insertBefore(separator, tabs)
164+
if (tabs) insertAfter(tabs, separator)
165165
}
166166
},
167167

src/browser/base/content/contentTheme-js.patch

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/browser/base/content/contentTheme.js b/browser/base/content/contentTheme.js
2-
index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdcaa2737bda 100644
2+
index a2298986bae01a16c5306223a963119d37d2f8e4..64783d98f228c7ee373dfc1492d62ed84143b88a 100644
33
--- a/browser/base/content/contentTheme.js
44
+++ b/browser/base/content/contentTheme.js
5-
@@ -135,6 +135,119 @@
5+
@@ -135,6 +135,105 @@
66
lwtProperty: "sidebar_highlight_text",
77
},
88
],
@@ -60,13 +60,6 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdca
6060
+ lwtProperty: "button_primary_color",
6161
+ }
6262
+ ],
63-
+ [
64-
+ "--in-content-link-color",
65-
+ {
66-
+ lwtProperty: "button_primary_color",
67-
+ }
68-
+ ],
69-
+
7063
+
7164
+ [
7265
+ "--in-content-primary-button-text-color-hover",
@@ -86,13 +79,6 @@ index d634a17c2633dc2ead40082c71622fe1b7a491a2..73b2dedad1ccd3db43aca773f2e8bdca
8679
+ lwtProperty: "button_primary_color",
8780
+ }
8881
+ ],
89-
+ [
90-
+ "--in-content-link-color-hover",
91-
+ {
92-
+ lwtProperty: "button_primary_color",
93-
+ }
94-
+ ],
95-
+
9682
+
9783
+ [
9884
+ "--in-content-page-background",
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
2-
index e86de659cda8d8f8bbc4df8346f97697e75848f5..91262ca49165a753dfdd644fd6ef2fd278f7a2d2 100644
2+
index 710e5248557993012830e41d025b530c7bf33ade..8f58c6b9a2e6d726a30f49b40839b2c70e8d7195 100644
33
--- a/browser/locales/en-US/browser/browser.ftl
44
+++ b/browser/locales/en-US/browser/browser.ftl
5-
@@ -963,3 +963,7 @@ firefox-relay-offer-how-we-integrate = By continuing, you’ll be able to genera
6-
# $sitename (String): name of the site where user enters their Relay mask
5+
@@ -982,6 +982,9 @@ firefox-relay-offer-how-we-integrate = By continuing, you’ll be able to genera
76
# $useremail (String): user email that will receive messages
87
firefox-relay-offer-what-relay-does = We’ll forward all emails from <strong>{ $sitename }</strong> to <strong>{ $useremail }</strong>.
9-
+
8+
109
+sidebar-context-delete =
1110
+ .label = Delete
1211
+
12+
## Popup Notification
13+
14+
popup-notification-xpinstall-prompt-learn-more = Learn more about installing add-ons safely

src/browser/themes/ThemeVariableMap-sys-mjs.patch

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/themes/ThemeVariableMap.sys.mjs b/browser/themes/ThemeVariableMap.sys.mjs
2-
index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377a2f5f165 100644
2+
index f2fd99193ddd0c24b7ad3ec953216973b162aaed..6d03f796569080667910276c631fb6731547c9d7 100644
33
--- a/browser/themes/ThemeVariableMap.sys.mjs
44
+++ b/browser/themes/ThemeVariableMap.sys.mjs
55
@@ -126,7 +126,9 @@ export const ThemeVariableMap = [
@@ -13,7 +13,26 @@ index f2fd99193ddd0c24b7ad3ec953216973b162aaed..1810528d3b1d7b5cd2fb3f45548c8377
1313
processColor(rgbaChannels, element) {
1414
if (!rgbaChannels) {
1515
element.removeAttribute("lwt-sidebar");
16-
@@ -187,4 +189,10 @@ export const ThemeContentPropertyList = [
16+
@@ -176,6 +178,18 @@ export const ThemeVariableMap = [
17+
},
18+
},
19+
],
20+
+ [
21+
+ "--in-content-link-color",
22+
+ {
23+
+ lwtProperty: "icon_color",
24+
+ },
25+
+ ],
26+
+ [
27+
+ "--in-content-link-color-hover",
28+
+ {
29+
+ lwtProperty: "icon_color",
30+
+ },
31+
+ ],
32+
];
33+
34+
export const ThemeContentPropertyList = [
35+
@@ -187,4 +201,10 @@ export const ThemeContentPropertyList = [
1736
"sidebar_highlight_text",
1837
"sidebar_text",
1938
"zap_gradient",

src/browser/themes/osx/browser-css.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

src/browser/themes/osx/jar-mn.patch

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)