diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:21:19 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-21 05:21:19 +0000 |
commit | 520a92573ce79e3628762e4ce06e284d50c2e548 (patch) | |
tree | dd7bece82fdce266f06a6a2a6043264255631ee7 /toolkit/components/extensions/parent/ext-runtime.js | |
parent | Adding debian version 115.10.0esr-1~deb12u1. (diff) | |
download | firefox-esr-520a92573ce79e3628762e4ce06e284d50c2e548.tar.xz firefox-esr-520a92573ce79e3628762e4ce06e284d50c2e548.zip |
Merging upstream version 115.11.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/components/extensions/parent/ext-runtime.js')
-rw-r--r-- | toolkit/components/extensions/parent/ext-runtime.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/toolkit/components/extensions/parent/ext-runtime.js b/toolkit/components/extensions/parent/ext-runtime.js index cd18e0f0aa..2122e8faed 100644 --- a/toolkit/components/extensions/parent/ext-runtime.js +++ b/toolkit/components/extensions/parent/ext-runtime.js @@ -237,9 +237,12 @@ this.runtime = class extends ExtensionAPIPersistent { }, async internalWakeupBackground() { + const { background } = extension.manifest; if ( - extension.manifest.background && - !extension.manifest.background.service_worker && + background && + (background.page || background.scripts) && + // Note: if background.service_worker is specified, it takes + // precedence over page/scripts, and persistentBackground is false. !extension.persistentBackground ) { await extension.wakeupBackground(); |