fix: in fireEvent copy provided data in a new Event's property 'data'

for backward compatibility copy the data's properties to Event skipping the ones already present in Event itself solve #67
bsorrentino · May 10, 2024 · e618981 · e618981
1 parent f8cb8a6
commit e618981
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/www/broadcaster.js b/www/broadcaster.js
@@ -75,11 +75,14 @@ var Broadcaster = /** @class */ (function () {
     Broadcaster.prototype.fireEvent = function (type, data) {
         if (!this._channelExists(type))
             return;
-        var event = document.createEvent('Event');
-        event.initEvent(type, false, false);
+        // const event = document.createEvent('Event');
+        // event.initEvent(type, false, false);
+        var event = new Event(type, { bubbles: false, cancelable: false });
         if (data) {
+            event['data'] = data; // fix #67
+            // for backward compatibility
             for (var i in data) {
-                if (data.hasOwnProperty(i)) {
+                if (data.hasOwnProperty(i) && event[i] === undefined) {
                     event[i] = data[i];
                 }
             }

diff --git a/www/broadcaster.ts b/www/broadcaster.ts
@@ -106,12 +106,15 @@ class Broadcaster {
   {
     if( !this._channelExists(type) ) return;
 
-    const event = document.createEvent('Event');
-    event.initEvent(type, false, false);
+    // const event = document.createEvent('Event');
+    // event.initEvent(type, false, false);
+    const event:any = new Event( type, { bubbles: false, cancelable: false})
     if (data) {
+        event['data'] = data // fix #67
+        // for backward compatibility
         for (var i in data) {
-            if (data.hasOwnProperty(i)) {
-                (<any>event)[i] = (<any>data)[i];
+            if (data.hasOwnProperty(i) && event[i] === undefined ) {
+                event[i] = (<any>data)[i];
             }
         }
     }