summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-26 05:39:27 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-26 05:39:27 +0200
commitb0d7b1bb38ba3c6940d17c6974b5295d9a10e161 (patch)
tree9ab7f6e19215bf87dac611f51299953e7c710dd5
parent6c3f95480a191ce432ddfb2aa400a6d70c4884a8 (diff)
downloadUXP-b0d7b1bb38ba3c6940d17c6974b5295d9a10e161.tar
UXP-b0d7b1bb38ba3c6940d17c6974b5295d9a10e161.tar.gz
UXP-b0d7b1bb38ba3c6940d17c6974b5295d9a10e161.tar.lz
UXP-b0d7b1bb38ba3c6940d17c6974b5295d9a10e161.tar.xz
UXP-b0d7b1bb38ba3c6940d17c6974b5295d9a10e161.zip
Bug 996448 - Lazify the loading of PluralForm.jsm everywhere
-rw-r--r--application/palemoon/base/content/browser.js10
-rw-r--r--application/palemoon/components/preferences/aboutPermissions.js5
-rw-r--r--application/palemoon/modules/webrtcUI.jsm4
3 files changed, 9 insertions, 10 deletions
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index c9f0aa4aa..556e7a2b7 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -83,14 +83,8 @@ this.__defineSetter__("AddonManager", function (val) {
return this.AddonManager = val;
});
-this.__defineGetter__("PluralForm", function() {
- Cu.import("resource://gre/modules/PluralForm.jsm");
- return this.PluralForm;
-});
-this.__defineSetter__("PluralForm", function (val) {
- delete this.PluralForm;
- return this.PluralForm = val;
-});
+XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
+ "resource://gre/modules/PluralForm.jsm");
XPCOMUtils.defineLazyModuleGetter(this, "AboutHomeUtils",
"resource:///modules/AboutHomeUtils.jsm");
diff --git a/application/palemoon/components/preferences/aboutPermissions.js b/application/palemoon/components/preferences/aboutPermissions.js
index 31b48f88e..99c9d44ad 100644
--- a/application/palemoon/components/preferences/aboutPermissions.js
+++ b/application/palemoon/components/preferences/aboutPermissions.js
@@ -6,13 +6,16 @@ var Ci = Components.interfaces;
var Cc = Components.classes;
var Cu = Components.utils;
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/PluralForm.jsm");
Cu.import("resource://gre/modules/DownloadUtils.jsm");
Cu.import("resource://gre/modules/AddonManager.jsm");
Cu.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/ForgetAboutSite.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
+ "resource://gre/modules/PluralForm.jsm");
+
var gFaviconService = Cc["@mozilla.org/browser/favicon-service;1"].
getService(Ci.nsIFaviconService);
diff --git a/application/palemoon/modules/webrtcUI.jsm b/application/palemoon/modules/webrtcUI.jsm
index c957bfd9a..9427fc630 100644
--- a/application/palemoon/modules/webrtcUI.jsm
+++ b/application/palemoon/modules/webrtcUI.jsm
@@ -11,9 +11,11 @@ const Cc = Components.classes;
const Ci = Components.interfaces;
Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/PluralForm.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+XPCOMUtils.defineLazyModuleGetter(this, "PluralForm",
+ "resource://gre/modules/PluralForm.jsm");
+
XPCOMUtils.defineLazyServiceGetter(this, "MediaManagerService",
"@mozilla.org/mediaManagerService;1",
"nsIMediaManagerService");