events: check signal before listener

In WPT Events, TypeError is expected if both listener and signal are null. But checking listener doesn't throw TypeError. So check signal before listener because checking signal throws TypeError if signal is null. PR-URL: #46054 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Juan José Arboleda <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
nodejs · Jan 4, 2023 · 5d4cb84 · 5d4cb84
1 parent 57048ac
commit 5d4cb84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/lib/internal/event_target.js b/lib/internal/event_target.js
@@ -561,6 +561,8 @@ class EventTarget {
       weak,
     } = validateEventListenerOptions(options);
 
+    validateAbortSignal(signal, 'options.signal');
+
     if (!validateEventListener(listener)) {
       // The DOM silently allows passing undefined as a second argument
       // No error code for this since it is a Warning
@@ -575,8 +577,6 @@ class EventTarget {
     }
     type = String(type);
 
-    validateAbortSignal(signal, 'options.signal');
-
     if (signal) {
       if (signal.aborted) {
         return;

diff --git a/test/wpt/status/dom/events.json b/test/wpt/status/dom/events.json
@@ -8,13 +8,6 @@
       ]
     }
   },
-  "AddEventListenerOptions-signal.any.js": {
-    "fail": {
-      "expected": [
-        "Passing null as the signal should throw (listener is also null)"
-      ]
-    }
-  },
   "Event-constructors.any.js": {
     "fail": {
       "expected": [