fix: fix load ignore video event bug

related to #136 #136
Chimeejs · Jun 26, 2018 · 7ea5ed8 · 7ea5ed8
1 parent a42e916
commit 7ea5ed8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 7 deletions.
diff --git a/__tests__/situation/load.js b/__tests__/situation/load.js
@@ -165,4 +165,32 @@ describe('load', () => {
     expect(originalVideo === player.$video).toBe(true);
     player.destroy();
   });
+
+  test('should not block normal video event at the load event', done => {
+    const plugin = {
+      name: 'test',
+      events: {
+        play() {
+          /* eslint-disable */
+          player.destroy();
+          /* eslint-enable */
+          done();
+        },
+      },
+    };
+    Chimee.install(plugin);
+    const player = new Chimee({
+      wrapper: document.createElement('div'),
+      src: 'http://cdn.toxicjohann.com/lostStar.mp4',
+      plugins: [ plugin.name ],
+    });
+    player.load('http://yunxianchang.live.ujne7.com/vod-system-bj/79_3041054cc65-ae8c-4b63-8937-5ccb05f79720.m3u8', {
+      box: 'hls',
+      preset: {
+        hls: ChimeeKernelHls,
+      },
+    }).then(() => {
+      player.$video.dispatchEvent(new Event('play'));
+    });
+  });
 });
diff --git a/src/dispatcher/index.js b/src/dispatcher/index.js
@@ -394,13 +394,11 @@ export default class Dispatcher {
     box?: string,
     preset?: Object,
     kernels?: UserKernelsConfig,
-    isFirst?: boolean,
   }, option: {
     isLive?: boolean,
     box?: string,
     preset?: Object,
     kernels?: UserKernelsConfig,
-    isFirst?: boolean,
   } = {}) {
     const src: string = isString(srcOrOption)
       ? srcOrOption
@@ -419,15 +417,12 @@ export default class Dispatcher {
       box = getLegalBox({ src, box: videoConfig.box }),
       preset = videoConfig.preset,
       kernels = videoConfig.kernels,
-      isFirst,
     } = option;
-    delete option.isFirst;
     if (box !== 'native' || box !== oldBox || !isEmpty(option)) {
-      option.isFirst = isFirst;
       const video = document.createElement('video');
       const config = { isLive, box, preset, src, kernels };
       const kernel = this._createKernel(video, config);
-      this.switchKernel({ video, kernel, config, notifyChange: isFirst });
+      this.switchKernel({ video, kernel, config, notifyChange: true });
     }
     const originAutoLoad = this.videoConfig.autoload;
     this._changeUnwatchable(this.videoConfig, 'autoload', false);
@@ -560,7 +555,7 @@ export default class Dispatcher {
         name: 'load',
         target: 'plugin',
         id: 'dispatcher',
-      }, { src: this.videoConfig.src, isFirst: true });
+      }, { src: this.videoConfig.src });
     }
   }
   _changeUnwatchable(object: Object, property: string, value: any) {