mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 05:08:36 +02:00
e930b89c34
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
77 lines
2.2 KiB
JavaScript
77 lines
2.2 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
"use strict";
|
|
|
|
var EXPORTED_SYMBOLS = ["Pocket"];
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
ChromeUtils.defineModuleGetter(this, "BrowserUtils",
|
|
"resource://gre/modules/BrowserUtils.jsm");
|
|
|
|
var Pocket = {
|
|
get site() { return Services.prefs.getCharPref("extensions.pocket.site"); },
|
|
get listURL() { return "https://" + Pocket.site + "/?src=ff_ext"; },
|
|
|
|
openList(event) {
|
|
let win = event.view;
|
|
let where = win.whereToOpenLink(event);
|
|
// Never override the current tab unless it's blank:
|
|
if (where == "current" && !win.gBrowser.selectedTab.isEmpty) {
|
|
where = "tab";
|
|
}
|
|
win.openTrustedLinkIn(this.listURL, where);
|
|
},
|
|
|
|
/**
|
|
* Functions related to the Pocket panel UI.
|
|
*/
|
|
onShownInPhotonPageActionPanel(panel, iframe) {
|
|
let window = panel.ownerGlobal;
|
|
window.pktUI.setPhotonPageActionPanelFrame(iframe);
|
|
Pocket._initPanelView(window);
|
|
},
|
|
|
|
_initPanelView(window) {
|
|
let document = window.document;
|
|
|
|
let libraryButton = document.getElementById("library-button");
|
|
if (libraryButton) {
|
|
BrowserUtils.setToolbarButtonHeightProperty(libraryButton);
|
|
}
|
|
|
|
let urlToSave = Pocket._urlToSave;
|
|
let titleToSave = Pocket._titleToSave;
|
|
Pocket._urlToSave = null;
|
|
Pocket._titleToSave = null;
|
|
// ViewShowing fires immediately before it creates the contents,
|
|
// in lieu of an AfterViewShowing event, just spin the event loop.
|
|
window.setTimeout(function() {
|
|
if (urlToSave) {
|
|
window.pktUI.tryToSaveUrl(urlToSave, titleToSave);
|
|
} else {
|
|
window.pktUI.tryToSaveCurrentPage();
|
|
}
|
|
}, 0);
|
|
},
|
|
|
|
_urlToSave: null,
|
|
_titleToSave: null,
|
|
savePage(browser, url, title) {
|
|
if (this.pageAction) {
|
|
this._urlToSave = url;
|
|
this._titleToSave = title;
|
|
this.pageAction.doCommand(browser.ownerGlobal);
|
|
}
|
|
},
|
|
|
|
get pageAction() {
|
|
return this._pageAction;
|
|
},
|
|
set pageAction(pageAction) {
|
|
return this._pageAction = pageAction;
|
|
},
|
|
_pageAction: null,
|
|
};
|