Commit f6c6d7d
events: set default handler value
Event handler like BroadcastChannel.onmessage and AbortSignal.onabort
have a default value of `null` but we return `undefined`.
Return `null` and add a test.
PR-URL: #41970
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Mestery <mestery@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>1 parent 8c912ab commit f6c6d7d
2 files changed
Lines changed: 10 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -929,7 +929,7 @@ function defineEventHandler(emitter, name) { | |||
| 929 | 929 | // 8.1.5.1 Event handlers - basically `on[eventName]` attributes | |
| 930 | 930 | ObjectDefineProperty(emitter, `on${name}`, { | |
| 931 | 931 | get() { | |
| 932 | - return this[kHandlers]?.get(name)?.handler; | ||
| 932 | + return this[kHandlers]?.get(name)?.handler ?? null; | ||
| 933 | 933 | }, | |
| 934 | 934 | set(value) { | |
| 935 | 935 | if (!this[kHandlers]) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -408,6 +408,13 @@ let asyncTest = Promise.resolve(); | |||
| 408 | 408 | target.onfoo = common.mustCall(); | |
| 409 | 409 | target.dispatchEvent(new Event('foo')); | |
| 410 | 410 | } | |
| 411 | + | ||
| 412 | + { | ||
| 413 | + const target = new EventTarget(); | ||
| 414 | + defineEventHandler(target, 'foo'); | ||
| 415 | + strictEqual(target.onfoo, null); | ||
| 416 | + } | ||
| 417 | + | ||
| 411 | 418 | { | |
| 412 | 419 | const target = new EventTarget(); | |
| 413 | 420 | defineEventHandler(target, 'foo'); | |
@@ -623,14 +630,14 @@ let asyncTest = Promise.resolve(); | |||
| 623 | 630 | strictEqual(et.constructor.name, 'EventTarget'); | |
| 624 | 631 | } | |
| 625 | 632 | { | |
| 626 | - // Weak event handlers work | ||
| 633 | + // Weak event listeners work | ||
| 627 | 634 | const et = new EventTarget(); | |
| 628 | 635 | const listener = common.mustCall(); | |
| 629 | 636 | et.addEventListener('foo', listener, { [kWeakHandler]: et }); | |
| 630 | 637 | et.dispatchEvent(new Event('foo')); | |
| 631 | 638 | } | |
| 632 | 639 | { | |
| 633 | - // Weak event handlers can be removed and weakness is not part of the key | ||
| 640 | + // Weak event listeners can be removed and weakness is not part of the key | ||
| 634 | 641 | const et = new EventTarget(); | |
| 635 | 642 | const listener = common.mustNotCall(); | |
| 636 | 643 | et.addEventListener('foo', listener, { [kWeakHandler]: et }); | |
0 commit comments