Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gluon.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"binaryName": "pulse-browser",
"version": {
"product": "firefox",
"version": "105.0.1"
"version": "106.0.5"
},
"buildOptions": {
"generateBranding": true
Expand Down
13 changes: 11 additions & 2 deletions src/browser/app/profile/firefox-js.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e3351ec7c 100644
index aac068a8177abe5031152e7b567b45fd2b5ef4a2..b0ed4a98f8d832b924b6b1a93eda75d746984613 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -19,6 +19,8 @@
Expand All @@ -19,6 +19,15 @@ index e91b0d5b4198b7e3967b6d144ae195da954f3ef3..ff38f32739948842a74499aa56f7487e
pref("xpinstall.signatures.devInfoURL", "https://wiki.mozilla.org/Addons/Extension_Signing");

// Enable extensionStorage storage actor by default
@@ -773,7 +774,7 @@ pref("browser.tabs.tooltipsShowPidAndActiveness", true);
pref("browser.tabs.tooltipsShowPidAndActiveness", false);
#endif

-pref("browser.tabs.firefox-view", true);
+pref("browser.tabs.firefox-view", false);
pref("browser.tabs.firefox-view.logLevel", "Warn");

// allow_eval_* is enabled on Firefox Desktop only at this
@@ -1937,7 +1938,6 @@ pref("browser.send_to_device_locales", "de,en-GB,en-US,es-AR,es-CL,es-ES,es-MX,f
pref("browser.vpn_promo.disallowed_regions", "ae,by,cn,cu,iq,ir,kp,om,ru,sd,sy,tm,tr,ua");

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

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

// Discovery prefs
Expand Down
28 changes: 14 additions & 14 deletions src/browser/components/BrowserGlue-jsm.patch
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm
index 64ac529d54270758b6dfa7a0a04b604b89a92402..e4b7844fd1df5c3ff09432c6d1664f72dba02320 100644
index cee46e6341f98441df743f4f5abccc380a67f74b..1102e374a8a93f2ae6142ff0bffaea71fdceb59c 100644
--- a/browser/components/BrowserGlue.jsm
+++ b/browser/components/BrowserGlue.jsm
@@ -4321,6 +4321,23 @@ BrowserGlue.prototype = {
@@ -4343,6 +4343,24 @@ BrowserGlue.prototype = {
},

async _maybeShowDefaultBrowserPrompt() {
+ // =========================================================================
+ // Pulse browser welcome
+
+
+ const welcomeEnabledPref = 'pulse.welcome.enabled'
+ const welcomeSeenPref = 'pulse.welcome.seen'
+
+
+ // NOTE: Get bool prefs takes in two options, the pref string and a default
+ // value if it is not defined
+
+
+ const welcomeEnabled = Services.prefs.getBoolPref(welcomeEnabledPref, true)
+ const welcomeSeen = Services.prefs.getBoolPref(welcomeSeenPref, false)
+
+ if (welcomeEnabled && !welcomeSeen)
+ this._showWelcomeDialog()
+
+ // =========================================================================
+
+
// Highest priority is the upgrade dialog, which can include a "primary
// browser" request and is limited in various ways, e.g., major upgrades.
const dialogVersion = 100;
@@ -4780,6 +4797,18 @@ BrowserGlue.prototype = {
const dialogVersion = 106;
@@ -4809,6 +4827,17 @@ BrowserGlue.prototype = {
"nsIObserver",
"nsISupportsWeakReference",
]),
+
+ /**
+ * Displays the welcome dialog. Trigured `_maybeShowDefaultBrowserPrompt`.
+ *
+ * @todo Add gluon docs for how to show custom popups on startup
+ * @patch Pulse Browser
+ */
+ * Displays the welcome dialog. Triggered `_maybeShowDefaultBrowserPrompt`.
+ *
+ * @todo Add gluon docs for how to show custom popups on startup
+ * @patch Pulse Browser
+ */
+ _showWelcomeDialog() {
+ lazy.BrowserWindowTracker.getTopWindow().gDialogBox.open(
+ "chrome://browser/content/welcome/welcome.html"
+ "chrome://browser/content/welcome/welcome.html"
+ );
+ },
};
Expand Down
6 changes: 3 additions & 3 deletions src/browser/components/moz-build.patch
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/browser/components/moz.build b/browser/components/moz.build
index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0ad198b50a 100644
index 3b2126e66efa27d4b941ceb93b46a04aa3cdef30..bbc1b8b248f32bf17764813402abf224b4bc38c1 100644
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@@ -60,6 +60,9 @@ DIRS += [
@@ -63,6 +63,9 @@ DIRS += [
"urlbar",
]

Expand All @@ -11,4 +11,4 @@ index 38f6b2c0ca72f55985a27256a028ba5d552c03ec..4bdc2faebce245267fac031a6fa93f0a
+
DIRS += ["build"]

if CONFIG["NIGHTLY_BUILD"]:

2 changes: 1 addition & 1 deletion src/browser/components/welcome/welcome.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class EngineStore {
}

async setDefaultEngine(engine) {
await Services.search.setDefault(engine)
await Services.search.setDefault(engine, Ci.nsISearchService.CHANGE_REASON_USER)
}
}

Expand Down