Bug 1369296 - show onboarding overlay in about:home;r=mossop,rexboy
MozReview-Commit-ID: DSc35nFt36r
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1670,9 +1670,9 @@ pref("browser.sessionstore.restore_tabs_
#ifdef NIGHTLY_BUILD
pref("urlclassifier.malwareTable", "goog-malware-shavar,goog-unwanted-shavar,goog-malware-proto,goog-unwanted-proto,test-malware-simple,test-unwanted-simple");
pref("urlclassifier.phishTable", "goog-phish-shavar,goog-phish-proto,test-phish-simple");
#endif
pref("browser.suppress_first_window_animation", true);
// Preferences for Photon onboarding system extension
-pref("browser.onboarding.disabled", false);
+pref("browser.onboarding.enabled", true);
--- a/browser/extensions/onboarding/content/onboarding.js
+++ b/browser/extensions/onboarding/content/onboarding.js
@@ -5,21 +5,22 @@
/* global content */
"use strict";
const {classes: Cc, interfaces: Ci, utils: Cu} = Components;
Cu.import("resource://gre/modules/Services.jsm");
const ONBOARDING_CSS_URL = "resource://onboarding/onboarding.css";
+const ABOUT_HOME_URL = "about:home";
const ABOUT_NEWTAB_URL = "about:newtab";
/**
* The script won't be initialized if we turned off onboarding by
- * setting "browser.onboarding.disabled" to true.
+ * setting "browser.onboarding.enabled" to false.
*/
class Onboarding {
constructor(contentWindow) {
this.init(contentWindow);
}
async init(contentWindow) {
this._window = contentWindow;
@@ -42,17 +43,17 @@ class Onboarding {
switch (evt.target.id) {
case "onboarding-overlay-icon":
case "onboarding-tour-close-btn":
// If the clicking target is directly on the outer-most overlay,
// that means clicking outside the tour content area.
// Let's toggle the overlay.
case "onboarding-overlay":
this.toggleOverlay();
- break;
+ break;
}
}
destroy() {
this._overlayIcon.remove();
this._overlay.remove();
}
@@ -98,16 +99,17 @@ class Onboarding {
link.addEventListener("load", resolve);
doc.head.appendChild(link);
});
}
}
addEventListener("load", function(evt) {
// Load onboarding module only when we enable it.
- if (content.location.href == ABOUT_NEWTAB_URL &&
- !Services.prefs.getBoolPref("browser.onboarding.disabled")) {
+ if ((content.location.href == ABOUT_NEWTAB_URL ||
+ content.location.href == ABOUT_HOME_URL) &&
+ Services.prefs.getBoolPref("browser.onboarding.enabled", false)) {
content.requestIdleCallback(() => {
new Onboarding(content);
});
}
}, true);