From ccf09e8ac7b5042ca8296934728e4e1e6618164b Mon Sep 17 00:00:00 2001 From: girst Date: Fri, 14 Jul 2023 13:26:55 +0200 Subject: [PATCH] use backwards compatible way to load Services.jsm if required regressed-by: https://bugzilla.mozilla.org/show_bug.cgi?id=1780695 see-also: https://hg.mozilla.org/mozilla-central/rev/911d540fce6f --- extension/bootstrap-frame.js.tmpl | 2 +- extension/bootstrap.coffee | 3 ++- extension/options.js | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extension/bootstrap-frame.js.tmpl b/extension/bootstrap-frame.js.tmpl index 34d9b45..e7cd32c 100644 --- a/extension/bootstrap-frame.js.tmpl +++ b/extension/bootstrap-frame.js.tmpl @@ -1,4 +1,4 @@ -const { Services } = ChromeUtils.import('resource://gre/modules/Services.jsm'); +const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services; Services.scriptloader.loadSubScript( Services.io.newURI('{{{ ADDON_PATH }}}/content/bootstrap.js', null, null).spec, this, diff --git a/extension/bootstrap.coffee b/extension/bootstrap.coffee index 02436c2..34090d0 100644 --- a/extension/bootstrap.coffee +++ b/extension/bootstrap.coffee @@ -16,7 +16,8 @@ do (global = this) -> BUILD_TIME = do -> # @echo BUILD_TIME REQUIRE_DATA = do -> # @echo REQUIRE_DATA - {Services} = ChromeUtils.import('resource://gre/modules/Services.jsm') + Services = globalThis.Services or + ChromeUtils.import('resource://gre/modules/Services.jsm').Services # <=fx103 shutdownHandlers = [] diff --git a/extension/options.js b/extension/options.js index 8aa2f09..209282e 100644 --- a/extension/options.js +++ b/extension/options.js @@ -1,6 +1,6 @@ "use strict"; -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services; window.addEventListener("load", () => { Services.obs.notifyObservers(document, "vimfx-options-displayed", ""); -- 2.39.3