From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- widget/tests/test_keycodes.xhtml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'widget/tests/test_keycodes.xhtml') diff --git a/widget/tests/test_keycodes.xhtml b/widget/tests/test_keycodes.xhtml index aea6aaae98..5adb07b4d8 100644 --- a/widget/tests/test_keycodes.xhtml +++ b/widget/tests/test_keycodes.xhtml @@ -519,14 +519,14 @@ function* runKeyEventTests() document.addEventListener("keypress", onKeyEvent); document.addEventListener("keyup", onKeyEvent); // Prevent almost all shortcut key handlers. - SpecialPowers.addSystemEventListener(document, "keypress", consumer, true); + SpecialPowers.wrap(document).addEventListener("keypress", consumer, { capture: true, mozSystemGroup: true }); function cleanup() { document.removeEventListener("keydown", onKeyEvent); document.removeEventListener("keypress", onKeyEvent); document.removeEventListener("keyup", onKeyEvent); - SpecialPowers.removeSystemEventListener(document, "keypress", consumer, true); + SpecialPowers.wrap(document).removeEventListener("keypress", consumer, { capture: true, mozSystemGroup: true }); } function* testKeysOnMac() @@ -4802,7 +4802,7 @@ function* runAccessKeyTests() var button = document.getElementById("button"); var activationCount; - function onClick(e) + function onClick() { ++activationCount; } @@ -4968,10 +4968,10 @@ function* runXULKeyTests() buttonParent.addEventListener("keypress", onKeyInDefaultEventGroup, true); buttonParent.addEventListener("keydown", onKeyInDefaultEventGroup); buttonParent.addEventListener("keypress", onKeyInDefaultEventGroup); - SpecialPowers.addSystemEventListener(buttonParent, "keydown", onKeyInSystemEventGroup, true); - SpecialPowers.addSystemEventListener(buttonParent, "keypress", onKeyInSystemEventGroup, true); - SpecialPowers.addSystemEventListener(buttonParent, "keydown", onKeyInSystemEventGroup, false); - SpecialPowers.addSystemEventListener(buttonParent, "keypress", onKeyInSystemEventGroup, false); + SpecialPowers.wrap(buttonParent).addEventListener("keydown", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(buttonParent).addEventListener("keypress", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(buttonParent).addEventListener("keydown", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); + SpecialPowers.wrap(buttonParent).addEventListener("keypress", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); function finializeKeyElementTest() { @@ -4979,10 +4979,10 @@ function* runXULKeyTests() buttonParent.removeEventListener("keypress", onKeyInDefaultEventGroup, true); buttonParent.removeEventListener("keydown", onKeyInDefaultEventGroup); buttonParent.removeEventListener("keypress", onKeyInDefaultEventGroup); - SpecialPowers.removeSystemEventListener(buttonParent, "keydown", onKeyInSystemEventGroup, true); - SpecialPowers.removeSystemEventListener(buttonParent, "keypress", onKeyInSystemEventGroup, true); - SpecialPowers.removeSystemEventListener(buttonParent, "keydown", onKeyInSystemEventGroup, false); - SpecialPowers.removeSystemEventListener(buttonParent, "keypress", onKeyInSystemEventGroup, false); + SpecialPowers.wrap(buttonParent).removeEventListener("keydown", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(buttonParent).removeEventListener("keypress", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(buttonParent).removeEventListener("keydown", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); + SpecialPowers.wrap(buttonParent).removeEventListener("keypress", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); } // If aKeyElement is empty string, this function tests if the event kicks @@ -5218,10 +5218,10 @@ function* runReservedKeyTests() contents[i].addEventListener("keypress", onKeyInDefaultEventGroup, true); contents[i].addEventListener("keydown", onKeyInDefaultEventGroup); contents[i].addEventListener("keypress", onKeyInDefaultEventGroup); - SpecialPowers.addSystemEventListener(contents[i], "keydown", onKeyInSystemEventGroup, true); - SpecialPowers.addSystemEventListener(contents[i], "keypress", onKeyInSystemEventGroup, true); - SpecialPowers.addSystemEventListener(contents[i], "keydown", onKeyInSystemEventGroup, false); - SpecialPowers.addSystemEventListener(contents[i], "keypress", onKeyInSystemEventGroup, false); + SpecialPowers.wrap(contents[i]).addEventListener("keydown", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(contents[i]).addEventListener("keypress", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(contents[i]).addEventListener("keydown", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); + SpecialPowers.wrap(contents[i]).addEventListener("keypress", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); } var keyEvents = []; @@ -5256,10 +5256,10 @@ function* runReservedKeyTests() contents[i].removeEventListener("keypress", onKeyInDefaultEventGroup, true); contents[i].removeEventListener("keydown", onKeyInDefaultEventGroup); contents[i].removeEventListener("keypress", onKeyInDefaultEventGroup); - SpecialPowers.removeSystemEventListener(contents[i], "keydown", onKeyInSystemEventGroup, true); - SpecialPowers.removeSystemEventListener(contents[i], "keypress", onKeyInSystemEventGroup, true); - SpecialPowers.removeSystemEventListener(contents[i], "keydown", onKeyInSystemEventGroup, false); - SpecialPowers.removeSystemEventListener(contents[i], "keypress", onKeyInSystemEventGroup, false); + SpecialPowers.wrap(contents[i]).removeEventListener("keydown", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(contents[i]).removeEventListener("keypress", onKeyInSystemEventGroup, { capture: true, mozSystemGroup: true }); + SpecialPowers.wrap(contents[i]).removeEventListener("keydown", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); + SpecialPowers.wrap(contents[i]).removeEventListener("keypress", onKeyInSystemEventGroup, { capture: false, mozSystemGroup: true }); } } -- cgit v1.2.3