fix(player): Fixed way to create events to pass data from media types…

… correctly
openplayerjs · Dec 18, 2019 · 8549577 · 8549577
1 parent e62163b
commit 8549577
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -435,8 +435,17 @@ function addEvent(event, details) {
     throw new Error('Event name must be a string');
   }
 
-  var detail = Object.assign({}, details);
-  return new CustomEvent(event, detail ? Object.assign({}, detail) : null);
+  var detail = null;
+
+  if (details) {
+    detail = details.detail ? {
+      detail: details.detail
+    } : {
+      detail: details
+    };
+  }
+
+  return new CustomEvent(event, detail);
 }
 
 exports.addEvent = addEvent;
@@ -8412,9 +8421,9 @@ var Ads = function () {
     value: function _error(event) {
       var details = {
         detail: {
-          type: 'Ads',
+          data: event.getError(),
           message: event.getError().toString(),
-          data: event.getError()
+          type: 'Ads'
         }
       };
       var errorEvent = events_1.addEvent('playererror', details);

diff --git a/dist/openplayer.min.js b/dist/openplayer.min.js
diff --git a/src/js/media/ads.ts b/src/js/media/ads.ts
@@ -677,9 +677,9 @@ class Ads {
     private _error(event: any): void {
         const details = {
             detail: {
-                type: 'Ads',
-                message: event.getError().toString(),
                 data: event.getError(),
+                message: event.getError().toString(),
+                type: 'Ads',
             },
         };
         const errorEvent = addEvent('playererror', details);

diff --git a/src/js/utils/events.ts b/src/js/utils/events.ts
@@ -12,8 +12,11 @@ export function addEvent(event: string, details?: CustomEventInit): CustomEvent
         throw new Error('Event name must be a string');
     }
 
-    const detail = { ...details };
-    return new CustomEvent(event, detail ? { ...detail } : null);
+    let detail = null;
+    if (details) {
+        detail = details.detail ? { detail: details.detail } : { detail: details };
+    }
+    return new CustomEvent(event, detail);
 }
 
 /**