Fixes #128: Always relying on globalThis.Services existing.

eyalroz · Jul 29, 2024 · 01bf845 · 01bf845
1 parent b030056
commit 01bf845
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/chrome/content/bidimailui-common.js b/src/chrome/content/bidimailui-common.js
@@ -1,5 +1,5 @@
 const EXPORTED_SYMBOLS = [ "BiDiMailUI" ];
-var     Services       = globalThis.Services || ChromeUtils.importESModule("resource://gre/modules/Services.sys.mjs").Services;
+var     Services       = globalThis.Services;
 const { XPCOMUtils   } = ChromeUtils.importESModule("resource://gre/modules/XPCOMUtils.sys.mjs");
 
 var BiDiMailUI = { };

diff --git a/src/chrome/content/bidimailui-composer.js b/src/chrome/content/bidimailui-composer.js
@@ -1,4 +1,4 @@
-var Services = globalThis.Services || ChromeUtils.importESModule("resource://gre/modules/Services.sys.mjs").Services;
+var Services = globalThis.Services;
 var { MailServices } = ChromeUtils.importESModule("resource:///modules/MailServices.sys.mjs");
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 

diff --git a/src/chrome/content/bidimailui-editor.js b/src/chrome/content/bidimailui-editor.js
@@ -1,4 +1,4 @@
-var Services = globalThis.Services || ChromeUtils.importESModule("resource://gre/modules/Services.sys.mjs").Services;
+var Services = globalThis.Services;
 const { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 BiDiMailUI.Editor = {};

diff --git a/src/chrome/content/bidimailui-messenger.js b/src/chrome/content/bidimailui-messenger.js
@@ -1,4 +1,4 @@
-var Services = globalThis.Services || ChromeUtils.importESModule("resource://gre/modules/Services.sys.mjs").Services;
+var Services = globalThis.Services;
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 // This file constains UI and glue code only, calling

diff --git a/src/chrome/content/overlay-injectors/3pane.js b/src/chrome/content/overlay-injectors/3pane.js
@@ -1,4 +1,4 @@
-var Services = globalThis.Services || ChromeUtils.importESModule("resource://gre/modules/Services.sys.mjs").Services;
+var Services = globalThis.Services;
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 // Note: There are some duplicates with injections from messenger.js, as those are not (easily) accessible

diff --git a/src/chrome/content/overlay-injectors/messenger.js b/src/chrome/content/overlay-injectors/messenger.js
@@ -1,4 +1,4 @@
-var Services = globalThis.Services || ChromeUtils.importESModule("resource://gre/modules/Services.sys.mjs").Services;
+var Services = globalThis.Services;
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 // Note: There are some duplicates with injections from 3pane.js, as those are not (easily) accessible

diff --git a/src/chrome/content/overlay-injectors/messengercompose.js b/src/chrome/content/overlay-injectors/messengercompose.js
@@ -1,4 +1,4 @@
-var Services = globalThis.Services || ChromeUtils.importESModule("resource://gre/modules/Services.sys.mjs").Services;
+var Services = globalThis.Services;
 var { BiDiMailUI } = ChromeUtils.import("chrome://bidimailui/content/bidimailui-common.js");
 
 const debugInjection = false;