fix(player): Removed resetting of autoplay and expand conditional t…

…o test if HLS.js needs to be loaded
openplayerjs · Dec 18, 2019 · 09c3124 · 09c3124
1 parent d2bf78b
commit 09c3124
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/dist/openplayer.js b/dist/openplayer.js
@@ -1531,7 +1531,6 @@ var Player = function () {
       }
 
       this.volume = this.element.volume;
-      this.element.autoplay = false;
     }
 
     return this;
@@ -7397,6 +7396,8 @@ var Media = function () {
     value: function _invoke(media) {
       var _this4 = this;
 
+      var playHLSNatively = this.element.canPlayType('application/vnd.apple.mpegurl') || this.element.canPlayType('application/x-mpegURL');
+
       if (Object.keys(this.customMedia.media).length) {
         var customRef;
         this.customMedia.rules.forEach(function (rule) {
@@ -7415,7 +7416,7 @@ var Media = function () {
         } else {
           return new html5_1["default"](this.element, media);
         }
-      } else if (source.isHlsSource(media)) {
+      } else if (!playHLSNatively && source.isHlsSource(media)) {
         var hlsOptions = this.options && this.options.hls ? this.options.hls : undefined;
         return new hls_1["default"](this.element, media, this.autoplay, hlsOptions);
       } else if (source.isDashSource(media)) {

diff --git a/dist/openplayer.min.js b/dist/openplayer.min.js
diff --git a/src/js/media.ts b/src/js/media.ts
@@ -505,6 +505,9 @@ class Media {
      * @memberof Media
      */
     private _invoke(media: Source): HlsMedia | DashMedia | HTML5Media | any {
+        const playHLSNatively = this.element.canPlayType('application/vnd.apple.mpegurl') ||
+            this.element.canPlayType('application/x-mpegURL');
+
         if (Object.keys(this.customMedia.media).length) {
             let customRef: any;
             this.customMedia.rules.forEach((rule: any) => {
@@ -521,7 +524,7 @@ class Media {
             } else {
                 return new HTML5Media(this.element, media);
             }
-        } else if (source.isHlsSource(media)) {
+        } else if (!playHLSNatively && source.isHlsSource(media)) {
             const hlsOptions = this.options && this.options.hls ? this.options.hls : undefined;
             return new HlsMedia(this.element, media, this.autoplay, hlsOptions);
         } else if (source.isDashSource(media)) {

diff --git a/src/js/player.ts b/src/js/player.ts
@@ -303,7 +303,6 @@ class Player {
                 this.element.currentTime = this.options.startTime;
             }
             this.volume = this.element.volume;
-            this.element.autoplay = false;
         }
         return this;
     }