forked from mirrors/gecko-dev
		
	 e930b89c34
			
		
	
	
		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
		
	
			
		
			
				
	
	
		
			88 lines
		
	
	
	
		
			2.9 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			88 lines
		
	
	
	
		
			2.9 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/. */
 | |
| 
 | |
| const {SiteDataManager} = ChromeUtils.import("resource:///modules/SiteDataManager.jsm");
 | |
| 
 | |
| ChromeUtils.defineModuleGetter(this, "DownloadUtils",
 | |
|                                "resource://gre/modules/DownloadUtils.jsm");
 | |
| 
 | |
| var gClearSiteDataDialog = {
 | |
|   _clearSiteDataCheckbox: null,
 | |
|   _clearCacheCheckbox: null,
 | |
|   _clearButton: null,
 | |
| 
 | |
|   onLoad() {
 | |
|     document.mozSubdialogReady = this.init();
 | |
|   },
 | |
| 
 | |
|   async init() {
 | |
|     this._clearButton = document.getElementById("clearButton");
 | |
|     this._cancelButton = document.getElementById("cancelButton");
 | |
|     this._clearSiteDataCheckbox = document.getElementById("clearSiteData");
 | |
|     this._clearCacheCheckbox = document.getElementById("clearCache");
 | |
| 
 | |
|     // We'll block init() on this because the result values may impact
 | |
|     // subdialog sizing.
 | |
|     await Promise.all([
 | |
|       SiteDataManager.getTotalUsage().then(bytes => {
 | |
|         let [amount, unit] = DownloadUtils.convertByteUnits(bytes);
 | |
|         document.l10n.setAttributes(this._clearSiteDataCheckbox,
 | |
|           "clear-site-data-cookies-with-data", { amount, unit });
 | |
|       }),
 | |
|       SiteDataManager.getCacheSize().then(bytes => {
 | |
|         let [amount, unit] = DownloadUtils.convertByteUnits(bytes);
 | |
|         document.l10n.setAttributes(this._clearCacheCheckbox,
 | |
|           "clear-site-data-cache-with-data", { amount, unit });
 | |
|       }),
 | |
|     ]);
 | |
|     await document.l10n.translateElements([
 | |
|       this._clearCacheCheckbox,
 | |
|       this._clearSiteDataCheckbox,
 | |
|     ]);
 | |
| 
 | |
|     window.addEventListener("keypress", this.onWindowKeyPress);
 | |
| 
 | |
|     this._cancelButton.addEventListener("command", window.close);
 | |
|     this._clearButton.addEventListener("command", () => this.onClear());
 | |
| 
 | |
|     this._clearSiteDataCheckbox.addEventListener("command", e => this.onCheckboxCommand(e));
 | |
|     this._clearCacheCheckbox.addEventListener("command", e => this.onCheckboxCommand(e));
 | |
|   },
 | |
| 
 | |
|   onWindowKeyPress(event) {
 | |
|     if (event.keyCode == KeyEvent.DOM_VK_ESCAPE)
 | |
|       window.close();
 | |
|   },
 | |
| 
 | |
|   onCheckboxCommand(event) {
 | |
|     this._clearButton.disabled =
 | |
|       !(this._clearSiteDataCheckbox.checked || this._clearCacheCheckbox.checked);
 | |
|   },
 | |
| 
 | |
|   onClear() {
 | |
|     let allowed = true;
 | |
| 
 | |
|     if (this._clearCacheCheckbox.checked && allowed) {
 | |
|       SiteDataManager.removeCache();
 | |
|       // If we're not clearing site data, we need to tell the
 | |
|       // SiteDataManager to signal that it's updating.
 | |
|       if (!this._clearSiteDataCheckbox.checked) {
 | |
|         SiteDataManager.updateSites();
 | |
|       }
 | |
|     }
 | |
| 
 | |
|     if (this._clearSiteDataCheckbox.checked) {
 | |
|       allowed = SiteDataManager.promptSiteDataRemoval(window);
 | |
|       if (allowed) {
 | |
|         SiteDataManager.removeSiteData();
 | |
|       }
 | |
|     }
 | |
| 
 | |
|     if (allowed) {
 | |
|       window.close();
 | |
|     }
 | |
|   },
 | |
| };
 | |
| 
 | |
| window.addEventListener("load", () => gClearSiteDataDialog.onLoad());
 |