mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-09 21:00:42 +02:00
***
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
108 lines
3.8 KiB
JavaScript
108 lines
3.8 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 = ["AboutPrivateBrowsingHandler"];
|
|
|
|
const {RemotePages} = ChromeUtils.import("resource://gre/modules/remotepagemanager/RemotePageManagerParent.jsm");
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
var AboutPrivateBrowsingHandler = {
|
|
_topics: [
|
|
"DontShowIntroPanelAgain",
|
|
"OpenPrivateWindow",
|
|
"SearchHandoff",
|
|
],
|
|
|
|
init() {
|
|
this.pageListener = new RemotePages("about:privatebrowsing");
|
|
for (let topic of this._topics) {
|
|
this.pageListener.addMessageListener(topic, this.receiveMessage.bind(this));
|
|
}
|
|
},
|
|
|
|
uninit() {
|
|
for (let topic of this._topics) {
|
|
this.pageListener.removeMessageListener(topic);
|
|
}
|
|
this.pageListener.destroy();
|
|
},
|
|
|
|
receiveMessage(aMessage) {
|
|
switch (aMessage.name) {
|
|
case "OpenPrivateWindow": {
|
|
let win = aMessage.target.browser.ownerGlobal;
|
|
win.OpenBrowserWindow({private: true});
|
|
break;
|
|
}
|
|
case "DontShowIntroPanelAgain": {
|
|
let win = aMessage.target.browser.ownerGlobal;
|
|
win.ContentBlocking.dontShowIntroPanelAgain();
|
|
break;
|
|
}
|
|
case "SearchHandoff": {
|
|
let searchAlias = "";
|
|
let searchAliases = Services.search.defaultEngine.wrappedJSObject.__internalAliases;
|
|
if (searchAliases && searchAliases.length > 0) {
|
|
searchAlias = `${searchAliases[0]} `;
|
|
}
|
|
let urlBar = aMessage.target.browser.ownerGlobal.gURLBar;
|
|
let isFirstChange = true;
|
|
|
|
if (!aMessage.data || !aMessage.data.text) {
|
|
urlBar.setHiddenFocus();
|
|
} else {
|
|
// Pass the provided text to the awesomebar. Prepend the @engine shortcut.
|
|
urlBar.search(`${searchAlias}${aMessage.data.text}`);
|
|
isFirstChange = false;
|
|
}
|
|
|
|
let checkFirstChange = () => {
|
|
// Check if this is the first change since we hidden focused. If it is,
|
|
// remove hidden focus styles, prepend the search alias and hide the
|
|
// in-content search.
|
|
if (isFirstChange) {
|
|
isFirstChange = false;
|
|
urlBar.removeHiddenFocus();
|
|
urlBar.search(searchAlias);
|
|
aMessage.target.sendAsyncMessage("HideSearch");
|
|
urlBar.removeEventListener("compositionstart", checkFirstChange);
|
|
urlBar.removeEventListener("paste", checkFirstChange);
|
|
}
|
|
};
|
|
|
|
let onKeydown = ev => {
|
|
// Check if the keydown will cause a value change.
|
|
if (ev.key.length === 1 && !ev.altKey && !ev.ctrlKey && !ev.metaKey) {
|
|
checkFirstChange();
|
|
}
|
|
// If the Esc button is pressed, we are done. Show in-content search and cleanup.
|
|
if (ev.key === "Escape") {
|
|
onDone();
|
|
}
|
|
};
|
|
|
|
let onDone = () => {
|
|
// We are done. Show in-content search again and cleanup.
|
|
aMessage.target.sendAsyncMessage("ShowSearch");
|
|
urlBar.removeHiddenFocus();
|
|
|
|
urlBar.removeEventListener("keydown", onKeydown);
|
|
urlBar.removeEventListener("mousedown", onDone);
|
|
urlBar.removeEventListener("blur", onDone);
|
|
urlBar.removeEventListener("compositionstart", checkFirstChange);
|
|
urlBar.removeEventListener("paste", checkFirstChange);
|
|
};
|
|
|
|
urlBar.addEventListener("keydown", onKeydown);
|
|
urlBar.addEventListener("mousedown", onDone);
|
|
urlBar.addEventListener("blur", onDone);
|
|
urlBar.addEventListener("compositionstart", checkFirstChange);
|
|
urlBar.addEventListener("paste", checkFirstChange);
|
|
break;
|
|
}
|
|
}
|
|
},
|
|
};
|