Commit d0212318 authored by ScottDowne's avatar ScottDowne
Browse files

Fixes bug 1488813 - Migrating Pocket off any bootstrap code r=ursula,k88hudson

Differential Revision: https://phabricator.services.mozilla.com/D6849

--HG--
rename : browser/extensions/pocket/content/AboutPocket.jsm => browser/components/pocket/content/AboutPocket.jsm
rename : browser/extensions/pocket/content/Pocket.jsm => browser/components/pocket/content/Pocket.jsm
rename : browser/extensions/pocket/bootstrap.js => browser/components/pocket/content/SaveToPocket.jsm
rename : browser/extensions/pocket/content/main.js => browser/components/pocket/content/main.js
rename : browser/extensions/pocket/content/panels/css/normalize.css => browser/components/pocket/content/panels/css/normalize.css
rename : browser/extensions/pocket/content/panels/css/saved.css => browser/components/pocket/content/panels/css/saved.css
rename : browser/extensions/pocket/content/panels/css/sendtomobile.css => browser/components/pocket/content/panels/css/sendtomobile.css
rename : browser/extensions/pocket/content/panels/css/signup.css => browser/components/pocket/content/panels/css/signup.css
rename : browser/extensions/pocket/content/panels/fonts/FiraSans-Regular.woff => browser/components/pocket/content/panels/fonts/FiraSans-Regular.woff
rename : browser/extensions/pocket/content/panels/img/app_store_dowload_apple.svg => browser/components/pocket/content/panels/img/app_store_dowload_apple.svg
rename : browser/extensions/pocket/content/panels/img/pocket-outline.svg => browser/components/pocket/content/panels/img/pocket-outline.svg
rename : browser/extensions/pocket/content/panels/img/pocketerror@1x.png => browser/components/pocket/content/panels/img/pocketerror@1x.png
rename : browser/extensions/pocket/content/panels/img/pocketerror@2x.png => browser/components/pocket/content/panels/img/pocketerror@2x.png
rename : browser/extensions/pocket/content/panels/img/pocketlogo@1x.png => browser/components/pocket/content/panels/img/pocketlogo@1x.png
rename : browser/extensions/pocket/content/panels/img/pocketlogo@2x.png => browser/components/pocket/content/panels/img/pocketlogo@2x.png
rename : browser/extensions/pocket/content/panels/img/pocketlogosolo@1x.png => browser/components/pocket/content/panels/img/pocketlogosolo@1x.png
rename : browser/extensions/pocket/content/panels/img/pocketlogosolo@2x.png => browser/components/pocket/content/panels/img/pocketlogosolo@2x.png
rename : browser/extensions/pocket/content/panels/img/pocketsignup_button@1x.png => browser/components/pocket/content/panels/img/pocketsignup_button@1x.png
rename : browser/extensions/pocket/content/panels/img/pocketsignup_button@2x.png => browser/components/pocket/content/panels/img/pocketsignup_button@2x.png
rename : browser/extensions/pocket/content/panels/img/pocketsignup_devices@1x.png => browser/components/pocket/content/panels/img/pocketsignup_devices@1x.png
rename : browser/extensions/pocket/content/panels/img/pocketsignup_devices@2x.png => browser/components/pocket/content/panels/img/pocketsignup_devices@2x.png
rename : browser/extensions/pocket/content/panels/img/pocketsignup_hero@1x.png => browser/components/pocket/content/panels/img/pocketsignup_hero@1x.png
rename : browser/extensions/pocket/content/panels/img/pocketsignup_hero@2x.png => browser/components/pocket/content/panels/img/pocketsignup_hero@2x.png
rename : browser/extensions/pocket/content/panels/img/signup_firefoxlogo@1x.png => browser/components/pocket/content/panels/img/signup_firefoxlogo@1x.png
rename : browser/extensions/pocket/content/panels/img/signup_firefoxlogo@2x.png => browser/components/pocket/content/panels/img/signup_firefoxlogo@2x.png
rename : browser/extensions/pocket/content/panels/img/signup_help@1x.png => browser/components/pocket/content/panels/img/signup_help@1x.png
rename : browser/extensions/pocket/content/panels/img/signup_help@2x.png => browser/components/pocket/content/panels/img/signup_help@2x.png
rename : browser/extensions/pocket/content/panels/img/tag_close@1x.png => browser/components/pocket/content/panels/img/tag_close@1x.png
rename : browser/extensions/pocket/content/panels/img/tag_close@2x.png => browser/components/pocket/content/panels/img/tag_close@2x.png
rename : browser/extensions/pocket/content/panels/img/tag_closeactive@1x.png => browser/components/pocket/content/panels/img/tag_closeactive@1x.png
rename : browser/extensions/pocket/content/panels/img/tag_closeactive@2x.png => browser/components/pocket/content/panels/img/tag_closeactive@2x.png
rename : browser/extensions/pocket/content/panels/js/messages.js => browser/components/pocket/content/panels/js/messages.js
rename : browser/extensions/pocket/content/panels/js/saved.js => browser/components/pocket/content/panels/js/saved.js
rename : browser/extensions/pocket/content/panels/js/sendtomobile.js => browser/components/pocket/content/panels/js/sendtomobile.js
rename : browser/extensions/pocket/content/panels/js/signup.js => browser/components/pocket/content/panels/js/signup.js
rename : browser/extensions/pocket/content/panels/js/tmpl.js => browser/components/pocket/content/panels/js/tmpl.js
rename : browser/extensions/pocket/content/panels/js/vendor/handlebars.runtime.js => browser/components/pocket/content/panels/js/vendor/handlebars.runtime.js
rename : browser/extensions/pocket/content/panels/js/vendor/jquery-2.1.1.min.js => browser/components/pocket/content/panels/js/vendor/jquery-2.1.1.min.js
rename : browser/extensions/pocket/content/panels/js/vendor/jquery.tokeninput.min.js => browser/components/pocket/content/panels/js/vendor/jquery.tokeninput.min.js
rename : browser/extensions/pocket/content/panels/license.txt => browser/components/pocket/content/panels/license.txt
rename : browser/extensions/pocket/content/panels/saved.html => browser/components/pocket/content/panels/saved.html
rename : browser/extensions/pocket/content/panels/signup.html => browser/components/pocket/content/panels/signup.html
rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_articleinfo.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_download.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_download_error.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v1.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v2.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars => browser/components/pocket/content/panels/tmpl/ho2/ho2_sharebutton_v3.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/saved_premiumextras.handlebars => browser/components/pocket/content/panels/tmpl/saved_premiumextras.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/saved_premiumshell.handlebars => browser/components/pocket/content/panels/tmpl/saved_premiumshell.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/saved_shell.handlebars => browser/components/pocket/content/panels/tmpl/saved_shell.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/saved_tmplogin.handlebars => browser/components/pocket/content/panels/tmpl/saved_tmplogin.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/signup_shell.handlebars => browser/components/pocket/content/panels/tmpl/signup_shell.handlebars
rename : browser/extensions/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars => browser/components/pocket/content/panels/tmpl/signupstoryboard_shell.handlebars
rename : browser/extensions/pocket/content/pktApi.jsm => browser/components/pocket/content/pktApi.jsm
rename : browser/extensions/pocket/content/pocket-content-process.js => browser/components/pocket/content/pocket-content-process.js
rename : browser/extensions/pocket/jar.mn => browser/components/pocket/jar.mn
rename : browser/extensions/pocket/locale/ach/pocket.properties => browser/components/pocket/locale/ach/pocket.properties
rename : browser/extensions/pocket/locale/ar/pocket.properties => browser/components/pocket/locale/ar/pocket.properties
rename : browser/extensions/pocket/locale/ast/pocket.properties => browser/components/pocket/locale/ast/pocket.properties
rename : browser/extensions/pocket/locale/az/pocket.properties => browser/components/pocket/locale/az/pocket.properties
rename : browser/extensions/pocket/locale/be/pocket.properties => browser/components/pocket/locale/be/pocket.properties
rename : browser/extensions/pocket/locale/bg/pocket.properties => browser/components/pocket/locale/bg/pocket.properties
rename : browser/extensions/pocket/locale/bn-BD/pocket.properties => browser/components/pocket/locale/bn-BD/pocket.properties
rename : browser/extensions/pocket/locale/bn-IN/pocket.properties => browser/components/pocket/locale/bn-IN/pocket.properties
rename : browser/extensions/pocket/locale/br/pocket.properties => browser/components/pocket/locale/br/pocket.properties
rename : browser/extensions/pocket/locale/bs/pocket.properties => browser/components/pocket/locale/bs/pocket.properties
rename : browser/extensions/pocket/locale/ca/pocket.properties => browser/components/pocket/locale/ca/pocket.properties
rename : browser/extensions/pocket/locale/cak/pocket.properties => browser/components/pocket/locale/cak/pocket.properties
rename : browser/extensions/pocket/locale/cs/pocket.properties => browser/components/pocket/locale/cs/pocket.properties
rename : browser/extensions/pocket/locale/cy/pocket.properties => browser/components/pocket/locale/cy/pocket.properties
rename : browser/extensions/pocket/locale/da/pocket.properties => browser/components/pocket/locale/da/pocket.properties
rename : browser/extensions/pocket/locale/de/pocket.properties => browser/components/pocket/locale/de/pocket.properties
rename : browser/extensions/pocket/locale/dsb/pocket.properties => browser/components/pocket/locale/dsb/pocket.properties
rename : browser/extensions/pocket/locale/el/pocket.properties => browser/components/pocket/locale/el/pocket.properties
rename : browser/extensions/pocket/locale/en-GB/pocket.properties => browser/components/pocket/locale/en-GB/pocket.properties
rename : browser/extensions/pocket/locale/en-GB/pocket.properties => browser/components/pocket/locale/en-US/pocket.properties
rename : browser/extensions/pocket/locale/eo/pocket.properties => browser/components/pocket/locale/eo/pocket.properties
rename : browser/extensions/pocket/locale/es-AR/pocket.properties => browser/components/pocket/locale/es-AR/pocket.properties
rename : browser/extensions/pocket/locale/es-CL/pocket.properties => browser/components/pocket/locale/es-CL/pocket.properties
rename : browser/extensions/pocket/locale/es-ES/pocket.properties => browser/components/pocket/locale/es-ES/pocket.properties
rename : browser/extensions/pocket/locale/es-MX/pocket.properties => browser/components/pocket/locale/es-MX/pocket.properties
rename : browser/extensions/pocket/locale/et/pocket.properties => browser/components/pocket/locale/et/pocket.properties
rename : browser/extensions/pocket/locale/eu/pocket.properties => browser/components/pocket/locale/eu/pocket.properties
rename : browser/extensions/pocket/locale/fa/pocket.properties => browser/components/pocket/locale/fa/pocket.properties
rename : browser/extensions/pocket/locale/ff/pocket.properties => browser/components/pocket/locale/ff/pocket.properties
rename : browser/extensions/pocket/locale/fi/pocket.properties => browser/components/pocket/locale/fi/pocket.properties
rename : browser/extensions/pocket/locale/fr/pocket.properties => browser/components/pocket/locale/fr/pocket.properties
rename : browser/extensions/pocket/locale/fy-NL/pocket.properties => browser/components/pocket/locale/fy-NL/pocket.properties
rename : browser/extensions/pocket/locale/ga-IE/pocket.properties => browser/components/pocket/locale/ga-IE/pocket.properties
rename : browser/extensions/pocket/locale/gd/pocket.properties => browser/components/pocket/locale/gd/pocket.properties
rename : browser/extensions/pocket/locale/gl/pocket.properties => browser/components/pocket/locale/gl/pocket.properties
rename : browser/extensions/pocket/locale/gu-IN/pocket.properties => browser/components/pocket/locale/gu-IN/pocket.properties
rename : browser/extensions/pocket/locale/he/pocket.properties => browser/components/pocket/locale/he/pocket.properties
rename : browser/extensions/pocket/locale/hi-IN/pocket.properties => browser/components/pocket/locale/hi-IN/pocket.properties
rename : browser/extensions/pocket/locale/hr/pocket.properties => browser/components/pocket/locale/hr/pocket.properties
rename : browser/extensions/pocket/locale/hsb/pocket.properties => browser/components/pocket/locale/hsb/pocket.properties
rename : browser/extensions/pocket/locale/hu/pocket.properties => browser/components/pocket/locale/hu/pocket.properties
rename : browser/extensions/pocket/locale/hy-AM/pocket.properties => browser/components/pocket/locale/hy-AM/pocket.properties
rename : browser/extensions/pocket/locale/id/pocket.properties => browser/components/pocket/locale/id/pocket.properties
rename : browser/extensions/pocket/locale/is/pocket.properties => browser/components/pocket/locale/is/pocket.properties
rename : browser/extensions/pocket/locale/it/pocket.properties => browser/components/pocket/locale/it/pocket.properties
rename : browser/extensions/pocket/locale/ja/pocket.properties => browser/components/pocket/locale/ja/pocket.properties
rename : browser/extensions/pocket/locale/jar.mn => browser/components/pocket/locale/jar.mn
rename : browser/extensions/pocket/locale/ka/pocket.properties => browser/components/pocket/locale/ka/pocket.properties
rename : browser/extensions/pocket/locale/kab/pocket.properties => browser/components/pocket/locale/kab/pocket.properties
rename : browser/extensions/pocket/locale/kk/pocket.properties => browser/components/pocket/locale/kk/pocket.properties
rename : browser/extensions/pocket/locale/km/pocket.properties => browser/components/pocket/locale/km/pocket.properties
rename : browser/extensions/pocket/locale/kn/pocket.properties => browser/components/pocket/locale/kn/pocket.properties
rename : browser/extensions/pocket/locale/ko/pocket.properties => browser/components/pocket/locale/ko/pocket.properties
rename : browser/extensions/pocket/locale/lij/pocket.properties => browser/components/pocket/locale/lij/pocket.properties
rename : browser/extensions/pocket/locale/lt/pocket.properties => browser/components/pocket/locale/lt/pocket.properties
rename : browser/extensions/pocket/locale/ltg/pocket.properties => browser/components/pocket/locale/ltg/pocket.properties
rename : browser/extensions/pocket/locale/lv/pocket.properties => browser/components/pocket/locale/lv/pocket.properties
rename : browser/extensions/pocket/locale/mk/pocket.properties => browser/components/pocket/locale/mk/pocket.properties
rename : browser/extensions/pocket/locale/ml/pocket.properties => browser/components/pocket/locale/ml/pocket.properties
rename : browser/extensions/pocket/locale/moz.build => browser/components/pocket/locale/moz.build
rename : browser/extensions/pocket/locale/mr/pocket.properties => browser/components/pocket/locale/mr/pocket.properties
rename : browser/extensions/pocket/locale/ms/pocket.properties => browser/components/pocket/locale/ms/pocket.properties
rename : browser/extensions/pocket/locale/my/pocket.properties => browser/components/pocket/locale/my/pocket.properties
rename : browser/extensions/pocket/locale/nb-NO/pocket.properties => browser/components/pocket/locale/nb-NO/pocket.properties
rename : browser/extensions/pocket/locale/ne-NP/pocket.properties => browser/components/pocket/locale/ne-NP/pocket.properties
rename : browser/extensions/pocket/locale/nl/pocket.properties => browser/components/pocket/locale/nl/pocket.properties
rename : browser/extensions/pocket/locale/nn-NO/pocket.properties => browser/components/pocket/locale/nn-NO/pocket.properties
rename : browser/extensions/pocket/locale/oc/pocket.properties => browser/components/pocket/locale/oc/pocket.properties
rename : browser/extensions/pocket/locale/or/pocket.properties => browser/components/pocket/locale/or/pocket.properties
rename : browser/extensions/pocket/locale/pa-IN/pocket.properties => browser/components/pocket/locale/pa-IN/pocket.properties
rename : browser/extensions/pocket/locale/pl/pocket.properties => browser/components/pocket/locale/pl/pocket.properties
rename : browser/extensions/pocket/locale/pt-BR/pocket.properties => browser/components/pocket/locale/pt-BR/pocket.properties
rename : browser/extensions/pocket/locale/pt-PT/pocket.properties => browser/components/pocket/locale/pt-PT/pocket.properties
rename : browser/extensions/pocket/locale/rm/pocket.properties => browser/components/pocket/locale/rm/pocket.properties
rename : browser/extensions/pocket/locale/ro/pocket.properties => browser/components/pocket/locale/ro/pocket.properties
rename : browser/extensions/pocket/locale/ru/pocket.properties => browser/components/pocket/locale/ru/pocket.properties
rename : browser/extensions/pocket/locale/sk/pocket.properties => browser/components/pocket/locale/sk/pocket.properties
rename : browser/extensions/pocket/locale/sl/pocket.properties => browser/components/pocket/locale/sl/pocket.properties
rename : browser/extensions/pocket/locale/sq/pocket.properties => browser/components/pocket/locale/sq/pocket.properties
rename : browser/extensions/pocket/locale/sr/pocket.properties => browser/components/pocket/locale/sr/pocket.properties
rename : browser/extensions/pocket/locale/sv-SE/pocket.properties => browser/components/pocket/locale/sv-SE/pocket.properties
rename : browser/extensions/pocket/locale/ta/pocket.properties => browser/components/pocket/locale/ta/pocket.properties
rename : browser/extensions/pocket/locale/te/pocket.properties => browser/components/pocket/locale/te/pocket.properties
rename : browser/extensions/pocket/locale/th/pocket.properties => browser/components/pocket/locale/th/pocket.properties
rename : browser/extensions/pocket/locale/tl/pocket.properties => browser/components/pocket/locale/tl/pocket.properties
rename : browser/extensions/pocket/locale/tr/pocket.properties => browser/components/pocket/locale/tr/pocket.properties
rename : browser/extensions/pocket/locale/uk/pocket.properties => browser/components/pocket/locale/uk/pocket.properties
rename : browser/extensions/pocket/locale/ur/pocket.properties => browser/components/pocket/locale/ur/pocket.properties
rename : browser/extensions/pocket/locale/vi/pocket.properties => browser/components/pocket/locale/vi/pocket.properties
rename : browser/extensions/pocket/locale/zh-CN/pocket.properties => browser/components/pocket/locale/zh-CN/pocket.properties
rename : browser/extensions/pocket/locale/zh-TW/pocket.properties => browser/components/pocket/locale/zh-TW/pocket.properties
rename : browser/extensions/pocket/moz.build => browser/components/pocket/moz.build
rename : browser/extensions/pocket/skin/shared/library-pocket-animation.svg => browser/components/pocket/skin/library-pocket-animation.svg
rename : browser/extensions/pocket/skin/shared/pocket-animation.svg => browser/components/pocket/skin/pocket-animation.svg
rename : browser/extensions/pocket/skin/shared/pocket-outline.svg => browser/components/pocket/skin/pocket-outline.svg
rename : browser/extensions/pocket/skin/shared/pocket.css => browser/components/pocket/skin/pocket.css
rename : browser/extensions/pocket/skin/shared/pocket.svg => browser/components/pocket/skin/pocket.svg
rename : browser/extensions/pocket/test/.eslintrc.js => browser/components/pocket/test/.eslintrc.js
rename : browser/extensions/pocket/test/browser.ini => browser/components/pocket/test/browser.ini
rename : browser/extensions/pocket/test/browser_pocket_ui_check.js => browser/components/pocket/test/browser_pocket_ui_check.js
rename : browser/extensions/pocket/test/head.js => browser/components/pocket/test/head.js
rename : browser/extensions/pocket/test/test.html => browser/components/pocket/test/test.html
extra : moz-landing-system : lando
parent 4a3b48e0
......@@ -83,8 +83,8 @@ browser/extensions/screenshots/**
browser/extensions/pdfjs/content/build**
browser/extensions/pdfjs/content/web**
# generated or library files in pocket
browser/extensions/pocket/content/panels/js/tmpl.js
browser/extensions/pocket/content/panels/js/vendor/**
browser/components/pocket/content/panels/js/tmpl.js
browser/components/pocket/content/panels/js/vendor/**
# Activity Stream has incompatible eslintrc. `npm run lint` from its directory
browser/components/newtab/**
# The only file in browser/locales/ is pre-processed.
......
......@@ -22,4 +22,5 @@
# changes to stick? As of bug 928195, this shouldn't be necessary! Please
# don't change CLOBBER for WebIDL changes any more.
Bug 1397263 - moving AS to moz.configure will break AS detection
Bug 1488813 - Migrating Pocket off any bootstrap code
......@@ -20,7 +20,7 @@ var StarUI = {
// the popup.
_autoCloseTimerEnabled: true,
// The autoclose timeout length. 3500ms matches the timeout that Pocket uses
// in browser/extensions/pocket/content/panels/js/saved.js.
// in browser/components/pocket/content/panels/js/saved.js.
_autoCloseTimeout: 3500,
_removeBookmarksOnPopupHidden: false,
......
......@@ -44,6 +44,7 @@ DIRS += [
'newtab',
'originattributes',
'places',
'pocket',
'preferences',
'privatebrowsing',
'resistfingerprinting',
......
......@@ -424,6 +424,7 @@ XPCOMUtils.defineLazyModuleGetters(this, {
RemoteSettings: "resource://services-settings/remote-settings.js",
SafeBrowsing: "resource://gre/modules/SafeBrowsing.jsm",
Sanitizer: "resource:///modules/Sanitizer.jsm",
SaveToPocket: "chrome://pocket/content/SaveToPocket.jsm",
SessionStartup: "resource:///modules/sessionstore/SessionStartup.jsm",
SessionStore: "resource:///modules/sessionstore/SessionStore.jsm",
ShellService: "resource:///modules/ShellService.jsm",
......@@ -1066,6 +1067,7 @@ BrowserGlue.prototype = {
const appSource = new FileSource("app", locales, "resource://app/localization/{locale}/");
L10nRegistry.registerSource(appSource);
SaveToPocket.init();
Services.obs.notifyObservers(null, "browser-ui-startup-complete");
},
......@@ -1422,6 +1424,7 @@ BrowserGlue.prototype = {
AboutPrivateBrowsingHandler.uninit();
AutoCompletePopup.uninit();
DateTimePickerParent.uninit();
SaveToPocket.uninit();
// Browser errors are only collected on Nightly, but telemetry for
// them is collected on all channels.
......
......@@ -3,13 +3,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
/* global ADDON_ENABLE:false, ADDON_DISABLE:false, APP_SHUTDOWN: false */
const Cm = Components.manager;
"use strict";
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
ChromeUtils.import("resource://services-common/utils.js");
ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
ChromeUtils.defineModuleGetter(this, "AboutPocket",
"chrome://pocket/content/AboutPocket.jsm");
ChromeUtils.defineModuleGetter(this, "AddonManagerPrivate",
......@@ -28,9 +25,11 @@ XPCOMUtils.defineLazyGetter(this, "gPocketBundle", function() {
return Services.strings.createBundle("chrome://pocket/locale/pocket.properties");
});
XPCOMUtils.defineLazyGetter(this, "gPocketStyleURI", function() {
return Services.io.newURI("chrome://pocket-shared/skin/pocket.css");
return Services.io.newURI("chrome://pocket/skin/pocket.css");
});
var EXPORTED_SYMBOLS = ["SaveToPocket"];
// Due to bug 1051238 frame scripts are cached forever, so we can't update them
// as a restartless add-on. The Math.random() is the work around for this.
const PROCESS_SCRIPT = "chrome://pocket/content/pocket-content-process.js?" + Math.random();
......@@ -396,7 +395,7 @@ function pktUIGetter(prop, window) {
}
var PocketOverlay = {
startup(reason) {
startup() {
let styleSheetService = Cc["@mozilla.org/content/style-sheet-service;1"]
.getService(Ci.nsIStyleSheetService);
this._sheetType = styleSheetService.AUTHOR_SHEET;
......@@ -411,7 +410,7 @@ var PocketOverlay = {
this.onWindowOpened(win);
}
},
shutdown(reason) {
shutdown() {
Services.ppmm.broadcastAsyncMessage("PocketShuttingDown");
Services.obs.removeObserver(this, "browser-delayed-startup-finished");
// Although the ppmm loads the scripts into the chrome process as well,
......@@ -501,43 +500,37 @@ var PocketOverlay = {
function prefObserver(aSubject, aTopic, aData) {
let enabled = Services.prefs.getBoolPref("extensions.pocket.enabled");
if (enabled)
PocketOverlay.startup(ADDON_ENABLE);
PocketOverlay.startup();
else
PocketOverlay.shutdown(ADDON_DISABLE);
PocketOverlay.shutdown();
}
function startup(data, reason) {
if (AddonManagerPrivate.addonIsActive("isreaditlater@ideashower.com"))
return;
setDefaultPrefs();
// migrate enabled pref
if (Services.prefs.prefHasUserValue("browser.pocket.enabled")) {
Services.prefs.setBoolPref("extensions.pocket.enabled", Services.prefs.getBoolPref("browser.pocket.enabled"));
Services.prefs.clearUserPref("browser.pocket.enabled");
}
// watch pref change and enable/disable if necessary
Services.prefs.addObserver("extensions.pocket.enabled", prefObserver);
if (!Services.prefs.getBoolPref("extensions.pocket.enabled"))
return;
PocketOverlay.startup(reason);
}
function shutdown(data, reason) {
// For speed sake, we should only do a shutdown if we're being disabled.
// On an app shutdown, just let it fade away...
if (reason != APP_SHUTDOWN) {
Services.prefs.removeObserver("extensions.pocket.enabled", prefObserver);
PocketOverlay.shutdown(reason);
}
function browserWindows() {
return Services.wm.getEnumerator("navigator:browser");
}
function install() {
}
var SaveToPocket = {
init() {
if (AddonManagerPrivate.addonIsActive("isreaditlater@ideashower.com"))
return;
function uninstall() {
}
setDefaultPrefs();
// migrate enabled pref
if (Services.prefs.prefHasUserValue("browser.pocket.enabled")) {
Services.prefs.setBoolPref("extensions.pocket.enabled", Services.prefs.getBoolPref("browser.pocket.enabled"));
Services.prefs.clearUserPref("browser.pocket.enabled");
}
// watch pref change and enable/disable if necessary
Services.prefs.addObserver("extensions.pocket.enabled", prefObserver);
if (!Services.prefs.getBoolPref("extensions.pocket.enabled"))
return;
PocketOverlay.startup();
},
function browserWindows() {
return Services.wm.getEnumerator("navigator:browser");
}
uninit() {
// For speed sake, we should only do a shutdown if we're being disabled.
// On an app shutdown, just let it fade away...
Services.prefs.removeObserver("extensions.pocket.enabled", prefObserver);
PocketOverlay.shutdown();
},
};
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment