fix(FEC-9471): slider progress bar exceeds 100% (#20)

kaltura · Dec 5, 2019 · fafad30 · fafad30
1 parent 0efeb17
commit fafad30
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/src/flash.js b/src/flash.js
@@ -45,14 +45,14 @@ class Flash extends FakeEventTarget implements IEngine {
    * @type {Object}
    * @private
    */
-  _config: Object = null;
+  _config: ?Object = null;
 
   /**
    * Promise when load finished
    * @type {Promise<*>}
    * @private
    */
-  _loadPromise: Promise<*> = null;
+  _loadPromise: ?Promise<*> = null;
 
   /**
    * volume value
@@ -303,7 +303,8 @@ class Flash extends FakeEventTarget implements IEngine {
         EventType.SEEKED,
         EventType.ENDED,
         EventType.VIDEO_TRACK_CHANGED,
-        EventType.AUDIO_TRACK_CHANGED
+        EventType.AUDIO_TRACK_CHANGED,
+        EventType.DURATION_CHANGE
       ];
       events.forEach(eventName => {
         this._eventManager.listen(this._api, eventName, (event: FakeEvent) => this.dispatchEvent(event));
@@ -419,11 +420,13 @@ class Flash extends FakeEventTarget implements IEngine {
    * @returns {void}
    */
   play(): void {
-    this._loadPromise.then(() => {
-      if (this._api) {
-        this._api.play();
-      }
-    });
+    if (this._loadPromise) {
+      this._loadPromise.then(() => {
+        if (this._api) {
+          this._api.play();
+        }
+      });
+    }
   }
 
   pause(): void {
@@ -799,7 +802,7 @@ class Flash extends FakeEventTarget implements IEngine {
    * @returns {boolean} - Whether the video tag has an attribute of playsinline.
    */
   get playsinline(): boolean {
-    return this._config.playsinline;
+    return this._config ? this._config.playsinline : false;
   }
 
   /**

diff --git a/src/flashhls-adapter.js b/src/flashhls-adapter.js
@@ -127,7 +127,10 @@ class FlashHLSAdapter extends FakeEventTarget {
       },
       position: (timemetrics: Object) => {
         this.paused = false;
-        this.duration = timemetrics.duration;
+        if (this.duration != timemetrics.duration) {
+          this.duration = timemetrics.duration;
+          this._trigger(EventType.DURATION_CHANGE);
+        }
         this.buffer = timemetrics.buffer;
         this.watched = timemetrics.watched;
         if (this.currentTime != timemetrics.position || this.ended) {
@@ -254,6 +257,7 @@ class FlashHLSAdapter extends FakeEventTarget {
 
   seek(to: number): void {
     if (this._api) {
+      this.currentTime = to;
       this._api.seek(to);
     }
   }