зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1333838. Only treat actual boolean return values from OnErrorEventHandlerNonNull as being able to cancel the event. r=smaug
This commit is contained in:
Boris Zbarsky
Родитель
04be1b37fe
Коммит
d07b805990
|
|
@ -162,13 +162,14 @@ JSEventHandler::HandleEvent(nsIDOMEvent* aEvent)
|
|||
RefPtr<OnErrorEventHandlerNonNull> handler =
|
||||
mTypedHandler.OnErrorEventHandler();
|
||||
ErrorResult rv;
|
||||
bool handled = handler->Call(mTarget, msgOrEvent, fileName, lineNumber,
|
||||
columnNumber, error, rv);
|
||||
JS::Rooted<JS::Value> retval(RootingCx());
|
||||
handler->Call(mTarget, msgOrEvent, fileName, lineNumber,
|
||||
columnNumber, error, &retval, rv);
|
||||
if (rv.Failed()) {
|
||||
return rv.StealNSResult();
|
||||
}
|
||||
|
||||
if (handled) {
|
||||
if (retval.isBoolean() && retval.toBoolean()) {
|
||||
event->PreventDefaultInternal(isChromeHandler);
|
||||
}
|
||||
return NS_OK;
|
||||
|
|
|
|||
|
|
@ -15,13 +15,11 @@ callback EventHandlerNonNull = any (Event event);
|
|||
typedef EventHandlerNonNull? EventHandler;
|
||||
|
||||
[TreatNonObjectAsNull]
|
||||
// https://www.w3.org/Bugs/Public/show_bug.cgi?id=23489
|
||||
//callback OnBeforeUnloadEventHandlerNonNull = DOMString (Event event);
|
||||
callback OnBeforeUnloadEventHandlerNonNull = DOMString? (Event event);
|
||||
typedef OnBeforeUnloadEventHandlerNonNull? OnBeforeUnloadEventHandler;
|
||||
|
||||
[TreatNonObjectAsNull]
|
||||
callback OnErrorEventHandlerNonNull = boolean ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
|
||||
callback OnErrorEventHandlerNonNull = any ((Event or DOMString) event, optional DOMString source, optional unsigned long lineno, optional unsigned long column, optional any error);
|
||||
typedef OnErrorEventHandlerNonNull? OnErrorEventHandler;
|
||||
|
||||
[NoInterfaceObject]
|
||||
|
|
|
|||
|
|
@ -94701,6 +94701,12 @@
|
|||
{}
|
||||
]
|
||||
],
|
||||
"html/webappapis/scripting/events/eventhandler-cancellation.html": [
|
||||
[
|
||||
"/html/webappapis/scripting/events/eventhandler-cancellation.html",
|
||||
{}
|
||||
]
|
||||
],
|
||||
"html/webappapis/scripting/events/inline-event-handler-ordering.html": [
|
||||
[
|
||||
"/html/webappapis/scripting/events/inline-event-handler-ordering.html",
|
||||
|
|
@ -175762,6 +175768,10 @@
|
|||
"8d4d0bfdf447591695ac134cd243277ea2326c84",
|
||||
"testharness"
|
||||
],
|
||||
"html/webappapis/scripting/events/eventhandler-cancellation.html": [
|
||||
"491fd73a4ec8812cb8dc1ee01e34a7ff2a07ffb3",
|
||||
"testharness"
|
||||
],
|
||||
"html/webappapis/scripting/events/inline-event-handler-ordering.html": [
|
||||
"0bf73411e0a015a81aefc1327d4c7ef1ca824a56",
|
||||
"testharness"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
<!doctype html>
|
||||
<meta charset=utf-8>
|
||||
<title></title>
|
||||
<script src=/resources/testharness.js></script>
|
||||
<script src=/resources/testharnessreport.js></script>
|
||||
<!-- A window to work with that won't trigger the harness exception detection
|
||||
when we fire "error" events at it -->
|
||||
<iframe style="display: none"></iframe>
|
||||
<script>
|
||||
test(function() {
|
||||
var blob = new Blob([""]);
|
||||
// Most targets disabled for now until
|
||||
// https://github.com/whatwg/html/issues/2296 is sorted out.
|
||||
var targets = [ frames[0] /*, document, document.documentElement,
|
||||
new Worker(URL.createObjectURL(blob) */ ];
|
||||
// Event constructors also mostly disabled until
|
||||
// https://github.com/whatwg/html/issues/2296 is sorted out.
|
||||
var eventCtors = [ /* Event, */ ErrorEvent /*, MouseEvent */ ];
|
||||
var values = [true, false, "", "abc", {}, 0, 1, -1, null, undefined,
|
||||
2.5, NaN, Infinity, Symbol.toStringTag ];
|
||||
// Event types also mostly disabled pending
|
||||
// https://github.com/whatwg/html/issues/2296
|
||||
var eventTypes = [ "error"/*, "click", "load"*/ ];
|
||||
|
||||
// Variables that keep track of which subtest we're running.
|
||||
var curTarget;
|
||||
var curValue;
|
||||
var curCtor;
|
||||
var curType;
|
||||
|
||||
function defaultPreventedTester(event) {
|
||||
var expectedValue;
|
||||
if (curTarget === frames[0] &&
|
||||
curCtor === ErrorEvent &&
|
||||
curValue === true &&
|
||||
curType == "error") {
|
||||
expectedValue = true;
|
||||
} else {
|
||||
// This will need adjusting once we allow more targets and event
|
||||
// constructors above!
|
||||
expectedValue = false;
|
||||
}
|
||||
var valueRepr;
|
||||
if (typeof curValue == "string") {
|
||||
valueRepr = '"' + curValue + '"';
|
||||
} else {
|
||||
valueRepr = String(curValue);
|
||||
}
|
||||
test(function() {
|
||||
assert_equals(event.defaultPrevented, expectedValue);
|
||||
}, "Returning " + valueRepr +
|
||||
" from " + String(curTarget) + "'s on" + curType +
|
||||
" event handler while " + curCtor.name +
|
||||
" is firing should" +
|
||||
(expectedValue ? "" : " not") +
|
||||
" cancel the event");
|
||||
}
|
||||
|
||||
for (curCtor of eventCtors) {
|
||||
for (curTarget of targets) {
|
||||
for (curType of eventTypes) {
|
||||
for (curValue of values) {
|
||||
// We have to make sure that defaultPreventedTester is added after
|
||||
// our event handler.
|
||||
curTarget["on" + curType] = function() { return curValue; }
|
||||
curTarget.addEventListener(curType, defaultPreventedTester);
|
||||
var e = new curCtor(curType, { cancelable: true });
|
||||
curTarget.dispatchEvent(e);
|
||||
curTarget["on" + curType] = null;
|
||||
curTarget.removeEventListener(curType, defaultPreventedTester);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}, "event handler cancellation behavior");
|
||||
</script>
|
||||
Загрузка…
Ссылка в новой задаче