1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- a/chrome/utils/BootstrapLoader.jsm
+++ b/chrome/utils/BootstrapLoader.jsm
@@ -7,12 +7,12 @@
let EXPORTED_SYMBOLS = [];
const { XPCOMUtils } = ChromeUtils.import('resource://gre/modules/XPCOMUtils.jsm');
+const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
XPCOMUtils.defineLazyModuleGetters(this, {
Blocklist: 'resource://gre/modules/Blocklist.jsm',
ConsoleAPI: 'resource://gre/modules/Console.jsm',
InstallRDF: 'chrome://userchromejs/content/RDFManifestConverter.jsm',
- Services: 'resource://gre/modules/Services.jsm',
});
Services.obs.addObserver(doc => {
--- a/chrome/utils/RDFDataSource.jsm
+++ b/chrome/utils/RDFDataSource.jsm
@@ -32,12 +32,10 @@
var EXPORTED_SYMBOLS = ["RDFLiteral", "RDFBlankNode", "RDFResource", "RDFDataSource"];
const {XPCOMUtils} = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
+const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser", "Element", "fetch"]);
-ChromeUtils.defineModuleGetter(this, "Services",
- "resource://gre/modules/Services.jsm");
-
function isElement(obj) {
return Element.isInstance(obj);
}
--- a/chrome/utils/userChrome.jsm
+++ b/chrome/utils/userChrome.jsm
@@ -1,7 +1,7 @@
let EXPORTED_SYMBOLS = [];
-const { Services } = ChromeUtils.import('resource://gre/modules/Services.jsm');
+const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
const { xPref } = ChromeUtils.import('chrome://userchromejs/content/xPref.jsm');
const { Management } = ChromeUtils.import('resource://gre/modules/Extension.jsm');
const { AppConstants } = ChromeUtils.import('resource://gre/modules/AppConstants.jsm');
--- a/chrome/utils/xPref.jsm
+++ b/chrome/utils/xPref.jsm
@@ -1,6 +1,6 @@
let EXPORTED_SYMBOLS = ['xPref'];
-const {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm');
+const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
var xPref = {
// Retorna o valor da preferência, seja qual for o tipo, mas não
|