summaryrefslogtreecommitdiffstats
path: root/toolkit/modules
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:40:09 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:40:09 +0000
commitc1701504b2366542c32c5e6eeff1ba62cc75f8f6 (patch)
tree81b15ef2846efcdbb09422dd283399e769cb7ef9 /toolkit/modules
parentReleasing progress-linux version 115.10.0esr-1~progress7.99u1. (diff)
downloadfirefox-esr-c1701504b2366542c32c5e6eeff1ba62cc75f8f6.tar.xz
firefox-esr-c1701504b2366542c32c5e6eeff1ba62cc75f8f6.zip
Merging upstream version 115.11.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/modules')
-rw-r--r--toolkit/modules/PopupNotifications.sys.mjs8
-rw-r--r--toolkit/modules/moz.build1
-rw-r--r--toolkit/modules/sessionstore/Utils.sys.mjs29
3 files changed, 6 insertions, 32 deletions
diff --git a/toolkit/modules/PopupNotifications.sys.mjs b/toolkit/modules/PopupNotifications.sys.mjs
index 0c33220174..370953a271 100644
--- a/toolkit/modules/PopupNotifications.sys.mjs
+++ b/toolkit/modules/PopupNotifications.sys.mjs
@@ -1939,10 +1939,14 @@ PopupNotifications.prototype = {
}
if (type == "buttoncommand" || type == "secondarybuttoncommand") {
- if (Services.focus.activeWindow != this.window) {
+ // TODO: Bug 1892756.
+ if (
+ Services.focus.activeWindow != this.window ||
+ notificationEl.matches(":-moz-window-inactive")
+ ) {
Services.console.logStringMessage(
"PopupNotifications._onButtonEvent: " +
- "Button click happened before the window was focused"
+ "Button click happened before the window was focused / active"
);
this.window.focus();
return;
diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build
index 858bfc466e..6d5467bae6 100644
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -230,7 +230,6 @@ EXTRA_JS_MODULES.sessionstore += [
"sessionstore/PrivacyFilter.sys.mjs",
"sessionstore/PrivacyLevel.sys.mjs",
"sessionstore/SessionHistory.sys.mjs",
- "sessionstore/Utils.sys.mjs",
]
EXTRA_JS_MODULES.third_party.fathom += ["third_party/fathom/fathom.mjs"]
diff --git a/toolkit/modules/sessionstore/Utils.sys.mjs b/toolkit/modules/sessionstore/Utils.sys.mjs
deleted file mode 100644
index 627cd22686..0000000000
--- a/toolkit/modules/sessionstore/Utils.sys.mjs
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-export var Utils = Object.freeze({
- /**
- * Restores frame tree |data|, starting at the given root |frame|. As the
- * function recurses into descendant frames it will call cb(frame, data) for
- * each frame it encounters, starting with the given root.
- */
- restoreFrameTreeData(frame, data, cb) {
- // Restore data for the root frame.
- // The callback can abort by returning false.
- if (cb(frame, data) === false) {
- return;
- }
-
- if (!data.hasOwnProperty("children")) {
- return;
- }
-
- // Recurse into child frames.
- SessionStoreUtils.forEachNonDynamicChildFrame(frame, (subframe, index) => {
- if (data.children[index]) {
- this.restoreFrameTreeData(subframe, data.children[index], cb);
- }
- });
- },
-});