EventHandler: export event hydration to function

twbs · Apr 14, 2022 · abbbf36 · abbbf36
1 parent 3987863
commit abbbf36
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/js/src/dom/event-handler.js b/js/src/dom/event-handler.js
@@ -288,18 +288,9 @@ const EventHandler = {
       defaultPrevented = jQueryEvent.isDefaultPrevented()
     }
 
-    const evt = new Event(event, { bubbles, cancelable: true })
-
-    // merge custom information in our event
-    if (typeof args !== 'undefined') {
-      for (const key of Object.keys(args)) {
-        Object.defineProperty(evt, key, {
-          get() {
-            return args[key]
-          }
-        })
-      }
-    }
+    let evt = new Event(event, { bubbles, cancelable: true })
+    evt = hydrateObj(evt, args)
+
 
     if (defaultPrevented) {
       evt.preventDefault()
@@ -317,4 +308,15 @@ const EventHandler = {
   }
 }
 
+function hydrateObj(obj, meta) {
+  for (const [key, value] of Object.entries(meta || {})) {
+    Object.defineProperty(obj, key, {
+      get() {
+        return value
+      }
+    })
+  }
+  return obj
+}
+
 export default EventHandler