mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-08 20:28: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
77 lines
2.5 KiB
JavaScript
77 lines
2.5 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/. */
|
|
|
|
/*
|
|
* Keeps the "browser.search.widget.inNavBar" preference synchronized.
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
var EXPORTED_SYMBOLS = ["SearchWidgetTracker"];
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
ChromeUtils.defineModuleGetter(this, "CustomizableUI",
|
|
"resource:///modules/CustomizableUI.jsm");
|
|
|
|
const WIDGET_ID = "search-container";
|
|
const PREF_NAME = "browser.search.widget.inNavBar";
|
|
|
|
const SearchWidgetTracker = {
|
|
init() {
|
|
this.onWidgetAdded = this.onWidgetRemoved = (widgetId, area) => {
|
|
if (widgetId == WIDGET_ID && area == CustomizableUI.AREA_NAVBAR) {
|
|
this.syncPreferenceWithWidget();
|
|
}
|
|
};
|
|
this.onWidgetReset = this.onWidgetUndoMove = node => {
|
|
if (node.id == WIDGET_ID) {
|
|
this.syncPreferenceWithWidget();
|
|
}
|
|
};
|
|
CustomizableUI.addListener(this);
|
|
Services.prefs.addObserver(PREF_NAME,
|
|
() => this.syncWidgetWithPreference());
|
|
},
|
|
|
|
onAreaNodeRegistered(aArea) {
|
|
// The placement of the widget always takes priority, and the preference
|
|
// should always match the actual placement when the browser starts up - i.e.
|
|
// once the navigation bar has been registered.
|
|
if (aArea == CustomizableUI.AREA_NAVBAR) {
|
|
this.syncPreferenceWithWidget();
|
|
}
|
|
},
|
|
|
|
onCustomizeEnd() {
|
|
// onWidgetUndoMove does not fire when the search container is moved back to
|
|
// the customization palette as a result of an undo, so we sync again here.
|
|
this.syncPreferenceWithWidget();
|
|
},
|
|
|
|
syncPreferenceWithWidget() {
|
|
Services.prefs.setBoolPref(PREF_NAME, this.widgetIsInNavBar);
|
|
},
|
|
|
|
syncWidgetWithPreference() {
|
|
let newValue = Services.prefs.getBoolPref(PREF_NAME);
|
|
if (newValue == this.widgetIsInNavBar) {
|
|
return;
|
|
}
|
|
|
|
if (newValue) {
|
|
// The URL bar widget is always present in the navigation toolbar, so we
|
|
// can simply read its position to place the search bar right after it.
|
|
CustomizableUI.addWidgetToArea(WIDGET_ID, CustomizableUI.AREA_NAVBAR,
|
|
CustomizableUI.getPlacementOfWidget("urlbar-container").position + 1);
|
|
} else {
|
|
CustomizableUI.removeWidgetFromArea(WIDGET_ID);
|
|
}
|
|
},
|
|
|
|
get widgetIsInNavBar() {
|
|
let placement = CustomizableUI.getPlacementOfWidget(WIDGET_ID);
|
|
return placement ? placement.area == CustomizableUI.AREA_NAVBAR : false;
|
|
},
|
|
};
|