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
		
	
			
		
			
				
	
	
		
			125 lines
		
	
	
	
		
			4.3 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			125 lines
		
	
	
	
		
			4.3 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| /* -*- indent-tabs-mode: nil; js-indent-level: 4 -*- */
 | |
| /* 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/. */
 | |
| 
 | |
| /* Shared Places Import - change other consumers if you change this: */
 | |
| var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
 | |
| var {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 | |
| XPCOMUtils.defineLazyModuleGetters(this, {
 | |
|   LightweightThemeChild: "resource:///actors/LightweightThemeChild.jsm",
 | |
|   PlacesUtils: "resource://gre/modules/PlacesUtils.jsm",
 | |
|   PlacesUIUtils: "resource:///modules/PlacesUIUtils.jsm",
 | |
|   PlacesTransactions: "resource://gre/modules/PlacesTransactions.jsm",
 | |
|   PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
 | |
| });
 | |
| XPCOMUtils.defineLazyScriptGetter(this, "PlacesTreeView",
 | |
|                                   "chrome://browser/content/places/treeView.js");
 | |
| XPCOMUtils.defineLazyScriptGetter(this, ["PlacesInsertionPoint", "PlacesController",
 | |
|                                          "PlacesControllerDragHelper"],
 | |
|                                   "chrome://browser/content/places/controller.js");
 | |
| /* End Shared Places Import */
 | |
| 
 | |
| var gHistoryTree;
 | |
| var gSearchBox;
 | |
| var gHistoryGrouping = "";
 | |
| var gSearching = false;
 | |
| 
 | |
| function HistorySidebarInit() {
 | |
|   let uidensity = window.top.document.documentElement.getAttribute("uidensity");
 | |
|   if (uidensity) {
 | |
|     document.documentElement.setAttribute("uidensity", uidensity);
 | |
|   }
 | |
| 
 | |
|   /* Listen for sidebar theme changes */
 | |
|   let themeListener = new LightweightThemeChild({
 | |
|     content: window,
 | |
|     chromeOuterWindowID: window.top.windowUtils.outerWindowID,
 | |
|     docShell: window.docShell,
 | |
|   });
 | |
| 
 | |
|   window.addEventListener("unload", () => {
 | |
|     themeListener.cleanup();
 | |
|   });
 | |
| 
 | |
|   gHistoryTree = document.getElementById("historyTree");
 | |
|   gSearchBox = document.getElementById("search-box");
 | |
| 
 | |
|   gHistoryGrouping = document.getElementById("viewButton").
 | |
|                               getAttribute("selectedsort");
 | |
| 
 | |
|   if (gHistoryGrouping == "site")
 | |
|     document.getElementById("bysite").setAttribute("checked", "true");
 | |
|   else if (gHistoryGrouping == "visited")
 | |
|     document.getElementById("byvisited").setAttribute("checked", "true");
 | |
|   else if (gHistoryGrouping == "lastvisited")
 | |
|     document.getElementById("bylastvisited").setAttribute("checked", "true");
 | |
|   else if (gHistoryGrouping == "dayandsite")
 | |
|     document.getElementById("bydayandsite").setAttribute("checked", "true");
 | |
|   else
 | |
|     document.getElementById("byday").setAttribute("checked", "true");
 | |
| 
 | |
|   searchHistory("");
 | |
| }
 | |
| 
 | |
| function GroupBy(groupingType) {
 | |
|   gHistoryGrouping = groupingType;
 | |
|   searchHistory(gSearchBox.value);
 | |
| }
 | |
| 
 | |
| function searchHistory(aInput) {
 | |
|   var query = PlacesUtils.history.getNewQuery();
 | |
|   var options = PlacesUtils.history.getNewQueryOptions();
 | |
| 
 | |
|   const NHQO = Ci.nsINavHistoryQueryOptions;
 | |
|   var sortingMode;
 | |
|   var resultType;
 | |
| 
 | |
|   switch (gHistoryGrouping) {
 | |
|     case "visited":
 | |
|       resultType = NHQO.RESULTS_AS_URI;
 | |
|       sortingMode = NHQO.SORT_BY_VISITCOUNT_DESCENDING;
 | |
|       break;
 | |
|     case "lastvisited":
 | |
|       resultType = NHQO.RESULTS_AS_URI;
 | |
|       sortingMode = NHQO.SORT_BY_DATE_DESCENDING;
 | |
|       break;
 | |
|     case "dayandsite":
 | |
|       resultType = NHQO.RESULTS_AS_DATE_SITE_QUERY;
 | |
|       break;
 | |
|     case "site":
 | |
|       resultType = NHQO.RESULTS_AS_SITE_QUERY;
 | |
|       sortingMode = NHQO.SORT_BY_TITLE_ASCENDING;
 | |
|       break;
 | |
|     case "day":
 | |
|     default:
 | |
|       resultType = NHQO.RESULTS_AS_DATE_QUERY;
 | |
|       break;
 | |
|   }
 | |
| 
 | |
|   if (aInput) {
 | |
|     query.searchTerms = aInput;
 | |
|     if (gHistoryGrouping != "visited" && gHistoryGrouping != "lastvisited") {
 | |
|       sortingMode = NHQO.SORT_BY_FRECENCY_DESCENDING;
 | |
|       resultType = NHQO.RESULTS_AS_URI;
 | |
|     }
 | |
|   }
 | |
| 
 | |
|   options.sortingMode = sortingMode;
 | |
|   options.resultType = resultType;
 | |
|   options.includeHidden = !!aInput;
 | |
| 
 | |
|   if (gHistoryGrouping == "lastvisited")
 | |
|     TelemetryStopwatch.start("HISTORY_LASTVISITED_TREE_QUERY_TIME_MS");
 | |
| 
 | |
|   // call load() on the tree manually
 | |
|   // instead of setting the place attribute in historySidebar.xul
 | |
|   // otherwise, we will end up calling load() twice
 | |
|   gHistoryTree.load(query, options);
 | |
| 
 | |
|   if (gHistoryGrouping == "lastvisited")
 | |
|     TelemetryStopwatch.finish("HISTORY_LASTVISITED_TREE_QUERY_TIME_MS");
 | |
| }
 | |
| 
 | |
| window.addEventListener("SidebarFocused",
 | |
|                         () => gSearchBox.focus());
 |