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

Commit 8661519

Browse files
authored
Merge pull request #135 from pulse-browser/firefox-106.0.5
2 parents 4258383 + 160ac92 commit 8661519

File tree

5 files changed

+30
-21
lines changed

5 files changed

+30
-21
lines changed

gluon.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"binaryName": "pulse-browser",
66
"version": {
77
"product": "firefox",
8-
"version": "105.0.1"
8+
"version": "106.0.5"
99
},
1010
"buildOptions": {
1111
"generateBranding": true

src/browser/app/profile/firefox-js.patch

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
2-
index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e3351ec7c 100644
2+
index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644
33
--- a/browser/app/profile/firefox.js
44
+++ b/browser/app/profile/firefox.js
55
@@ -19,6 +19,8 @@
@@ -19,6 +19,15 @@ index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e
1919
pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");
2020

2121
// Enable extensionStorage storage actor by default
22+
@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
23+
pref("browser.tabs.tooltipsShowPidAndActiveness", false);
24+
#endif
25+
26+
-pref("browser.tabs.firefox-view", true);
27+
+pref("browser.tabs.firefox-view", false);
28+
pref("browser.tabs.firefox-view.logLevel", "Warn");
29+
30+
// allow_eval_* is enabled on Firefox Desktop only at this
2231
@@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
2332
pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");
2433

@@ -49,7 +58,7 @@ index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e
4958
// Enable Pocket button home panel for non link pages.
5059
pref("extensions.pocket.showHome", true);
5160

52-
@@ -2246,9 +2238,6 @@ pref("toolkit.coverage.enabled", false);
61+
@@ -2243,9 +2235,6 @@ pref("toolkit.coverage.enabled", false);
5362
pref("toolkit.coverage.endpoint.base", "https://coverage.mozilla.org");
5463

5564
// Discovery prefs

src/browser/components/BrowserGlue-jsm.patch

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
2-
index 64ac529d54270758b6dfa7a0a04b604b89a92402..e4b7844fd1df5c3ff09432c6d1664f72dba02320 100644
2+
index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71fdceb59c 100644
33
--- a/browser/components/BrowserGlue.jsm
44
+++ b/browser/components/BrowserGlue.jsm
5-
@@ -4321,6 +4321,23 @@ BrowserGlue.prototype = {
5+
@@ -4343,6 +4343,24 @@ BrowserGlue.prototype = {
66
},
77

88
async _maybeShowDefaultBrowserPrompt() {
99
+ // =========================================================================
1010
+ // Pulse browser welcome
11-
+
11+
+
1212
+ const welcomeEnabledPref = 'pulse.welcome.enabled'
1313
+ const welcomeSeenPref = 'pulse.welcome.seen'
14-
+
14+
+
1515
+ // NOTE: Get bool prefs takes in two options, the pref string and a default
1616
+ // value if it is not defined
17-
+
17+
+
1818
+ const welcomeEnabled = Services.prefs.getBoolPref(welcomeEnabledPref, true)
1919
+ const welcomeSeen = Services.prefs.getBoolPref(welcomeSeenPref, false)
2020
+
2121
+ if (welcomeEnabled && !welcomeSeen)
2222
+ this._showWelcomeDialog()
2323
+
2424
+ // =========================================================================
25+
+
2526
+
2627
// Highest priority is the upgrade dialog, which can include a "primary
2728
// browser" request and is limited in various ways, e.g., major upgrades.
28-
const dialogVersion = 100;
29-
@@ -4780,6 +4797,18 @@ BrowserGlue.prototype = {
29+
const dialogVersion = 106;
30+
@@ -4809,6 +4827,17 @@ BrowserGlue.prototype = {
3031
"nsIObserver",
3132
"nsISupportsWeakReference",
3233
]),
33-
+
3434
+ /**
35-
+ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`.
36-
+ *
37-
+ * @todo Add gluon docs for how to show custom popups on startup
38-
+ * @patch Pulse Browser
39-
+ */
35+
+ * Displays the welcome dialog. Triggered `_maybeShowDefaultBrowserPrompt`.
36+
+ *
37+
+ * @todo Add gluon docs for how to show custom popups on startup
38+
+ * @patch Pulse Browser
39+
+ */
4040
+ _showWelcomeDialog() {
4141
+ lazy.BrowserWindowTracker.getTopWindow().gDialogBox.open(
42-
+ "chrome://browser/content/welcome/welcome.html"
42+
+ "chrome://browser/content/welcome/welcome.html"
4343
+ );
4444
+ },
4545
};
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/browser/components/moz.build b/browser/components/moz.build
2-
index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0ad198b50a 100644
2+
index 3b2126e66efa27d4b941ceb93b46a04aa3cdef30..bbc1b8b248f32bf17764813402abf224b4bc38c1 100644
33
--- a/browser/components/moz.build
44
+++ b/browser/components/moz.build
5-
@@ -60,6 +60,9 @@ DIRS += [
5+
@@ -63,6 +63,9 @@ DIRS += [
66
"urlbar",
77
]
88

@@ -11,4 +11,4 @@ index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0a
1111
+
1212
DIRS += ["build"]
1313

14-
if CONFIG["NIGHTLY_BUILD"]:
14+

src/browser/components/welcome/welcome.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class EngineStore {
6565
}
6666

6767
async setDefaultEngine(engine) {
68-
await Services.search.setDefault(engine)
68+
await Services.search.setDefault(engine, Ci.nsISearchService.CHANGE_REASON_USER)
6969
}
7070
}
7171

0 commit comments

Comments
 (0)