Bug 1111142 - (Part 1) Turn aboutReader.js into an AboutReader module. r=mfinkle,bnicholson

--HG--
rename : toolkit/components/reader/content/aboutReader.js => toolkit/components/reader/AboutReader.jsm
extra : rebase_source : 71b5f80bc1db7378721c5a433f2b8e20bd5169c5

mobile/android/chrome/content/browser.js

@@ -109,6 +109,9 @@ XPCOMUtils.defineLazyModuleGetter(this, "SharedPreferences",
 XPCOMUtils.defineLazyModuleGetter(this, "Notifications",
                                   "resource://gre/modules/Notifications.jsm");
 
+XPCOMUtils.defineLazyModuleGetter(this, "AboutReader",
+                                  "resource://gre/modules/AboutReader.jsm");
+
 XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode",
                                   "resource://gre/modules/ReaderMode.jsm");
 
@@ -119,7 +122,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "GMPInstallManager",
 [
   ["SelectHelper", "chrome://browser/content/SelectHelper.js"],
   ["InputWidgetHelper", "chrome://browser/content/InputWidgetHelper.js"],
-  ["AboutReader", "chrome://global/content/reader/aboutReader.js"],
   ["MasterPassword", "chrome://browser/content/MasterPassword.js"],
   ["PluginHelper", "chrome://browser/content/PluginHelper.js"],
   ["OfflineApps", "chrome://browser/content/OfflineApps.js"],

toolkit/components/reader/AboutReader.jsm

@@ -2,14 +2,19 @@
  * 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";
+
 let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils;
 
+this.EXPORTED_SYMBOLS = [ "AboutReader" ];
+
 Cu.import("resource://gre/modules/Messaging.jsm");
 Cu.import("resource://gre/modules/Services.jsm")
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "UITelemetry",
-                                  "resource://gre/modules/UITelemetry.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "ReaderMode", "resource://gre/modules/ReaderMode.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "Task", "resource://gre/modules/Task.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "UITelemetry", "resource://gre/modules/UITelemetry.jsm");
 
 XPCOMUtils.defineLazyGetter(window, "gChromeWin", function ()
   window.QueryInterface(Ci.nsIInterfaceRequestor)
@@ -786,7 +791,7 @@ AboutReader.prototype = {
           return;
 
         // Wait for reflow before calculating the new position of the popup.
-        setTimeout(updatePopupPosition, 0);
+        win.setTimeout(updatePopupPosition, 0);
       }, true);
 
       dropdownToggle.addEventListener("click", function(aEvent) {

toolkit/components/reader/jar.mn

@@ -4,7 +4,6 @@
 
 toolkit.jar:
   content/global/reader/aboutReader.html             (content/aboutReader.html)
-  content/global/reader/aboutReader.js               (content/aboutReader.js)
   content/global/reader/Readability.js               (content/Readability.js)
   content/global/reader/JSDOMParser.js               (content/JSDOMParser.js)
   content/global/reader/readerWorker.js              (content/readerWorker.js)

toolkit/components/reader/moz.build

@@ -7,5 +7,6 @@
 JAR_MANIFESTS += ['jar.mn']
 
 EXTRA_JS_MODULES += [
+  'AboutReader.jsm',
   'ReaderMode.jsm'
 ]