lib: let abort_controller target be EventTarget

The AbortController abort event should have EventTarget as a target property of the argument event. PR-URL: #35869 Refs: https://github.com/web-platform-tests/wpt/blob/master/dom/abort/event.any.js Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
nodejs · Nov 3, 2020 · d2f574b · d2f574b
1 parent 1303a1f
commit d2f574b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/internal/abort_controller.js b/lib/internal/abort_controller.js
@@ -10,6 +10,7 @@ const {
 } = primordials;
 
 const {
+  defineEventHandler,
   EventTarget,
   Event,
   kTrustEvent
@@ -53,9 +54,6 @@ function abortSignal(signal) {
   const event = new Event('abort', {
     [kTrustEvent]: true
   });
-  if (typeof signal.onabort === 'function') {
-    signal.onabort(event);
-  }
   signal.dispatchEvent(event);
 }
 
@@ -67,6 +65,7 @@ class AbortController {
   constructor() {
     this[kSignal] = new AbortSignal();
     emitExperimentalWarning('AbortController');
+    defineEventHandler(this[kSignal], 'abort');
   }
 
   get signal() { return this[kSignal]; }

diff --git a/lib/internal/event_target.js b/lib/internal/event_target.js
@@ -334,14 +334,13 @@ class EventTarget {
       }
       return event;
     };
+    if (event !== undefined)
+      event[kTarget] = this;
 
     const root = this[kEvents].get(type);
     if (root === undefined || root.next === undefined)
       return true;
 
-    if (event !== undefined)
-      event[kTarget] = this;
-
     let handler = root.next;
     let next;