xgplayer 2.31.3 → 2.31.7

package/dist/index.js

@@ -1221,7 +1221,7 @@ module.exports = exports["default"];
 /* 8 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"version\":\"2.31.3\"}");
+module.exports = JSON.parse("{\"version\":\"2.31.7\"}");
 
 /***/ }),
 /* 9 */
@@ -1659,12 +1659,12 @@ var Player = function (_Proxy) {
         (0, _allOff2.default)(this);
       }
 
-      if (!this.paused) {
-        this.pause();
-        this.once('pause', destroyFunc);
-      } else {
-        destroyFunc.call(this);
-      }
+      // destroy immediately
+      // Don't use the paused property detection, it doesn't use MediaElement.paused, 
+      // so it's not accurate enough. Destroy after waiting for pause event, this 
+      // changes the synchronous behavior of destroy api
+      destroyFunc.call(this);
+
       _get(Player.prototype.__proto__ || Object.getPrototypeOf(Player.prototype), 'destroy', this).call(this);
     }
   }, {
@@ -2703,6 +2703,11 @@ var Proxy = function () {
     get: function get() {
       return (0, _util.hasClass)(this.root, 'xgplayer-pip-active');
     }
+  }, {
+    key: 'isMiniPlayer',
+    get: function get() {
+      return (0, _util.hasClass)(this.root, 'xgplayer-miniplayer-active');
+    }
   }]);
 
   return Proxy;
@@ -4730,8 +4735,12 @@ var s_progress = function s_progress() {
       player.config.enableSwipeHandler.call(player);
     });
   };
-
-  ['touchstart', 'mousedown'].forEach(function (item) {
+  var events = ['touchstart', 'mousedown'];
+  if (_sniffer2.default.device === 'mobile') {
+    // 解决在移动端触发多次seeking问题
+    events.pop();
+  }
+  events.forEach(function (item) {
     container.addEventListener(item, function (e) {
       if (player.config.disableProgress) return;
       // e.preventDefault()
@@ -4770,6 +4779,7 @@ var s_progress = function s_progress() {
           progress.style.width = w * 100 / containerWidth + '%';
 
           if (player.videoConfig.mediaType === 'video' && !player.dash && !player.config.closeMoveSeek) {
+            console.log('trigger touchmove');
             player.currentTime = Number(now).toFixed(1);
           } else {
             var time = (0, _util.findDom)(player.controls, '.xgplayer-time');
@@ -4795,6 +4805,7 @@ var s_progress = function s_progress() {
         player.emit('focus');
       };
       var up = function up(e) {
+        console.log('up event', e);
         // e.preventDefault()
         e.stopPropagation();
         (0, _util.event)(e);
@@ -4814,6 +4825,7 @@ var s_progress = function s_progress() {
           if (now < 0) now = 0;
           if (player.config.allowSeekPlayed && Number(now).toFixed(1) > player.maxPlayedTime) {} else {
             progress.style.width = w * 100 / containerWidth + '%';
+            console.warn('trigger touchup');
             player.currentTime = Number(now).toFixed(1);
           }
         }
@@ -4823,10 +4835,14 @@ var s_progress = function s_progress() {
         player.emit('focus');
         player.isProgressMoving = false;
       };
-      window.addEventListener('mousemove', move);
+      // if (item === 'touchstart') {
       window.addEventListener('touchmove', move, { passive: false });
-      window.addEventListener('mouseup', up);
       window.addEventListener('touchend', up);
+      // } else {
+      window.addEventListener('mousemove', move);
+      // console.warn('add envent mouseup')
+      window.addEventListener('mouseup', up);
+      // }
       return true;
     });
   });
@@ -6321,7 +6337,10 @@ Object.defineProperty(exports, "__esModule", {
 var memoryPlay = function memoryPlay() {
   var player = this;
   player.on('memoryPlayStart', function (lastPlayTime) {
-    player.currentTime = lastPlayTime;
+    setTimeout(function () {
+      console.log('memoryPlayStart', lastPlayTime, player.readyState, 11);
+      player.currentTime = lastPlayTime;
+    });
   });
 };
 
@@ -6484,7 +6503,7 @@ module.exports = exports['default'];
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * Draggabilly v2.3.0
+ * Draggabilly v2.4.1
  * Make that shiz draggable
  * https://draggabilly.desandro.com
  * MIT license
@@ -7122,7 +7141,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * Unidragger v2.3.1
+ * Unidragger v2.4.0
  * Draggable base class
  * MIT license
  */
@@ -7395,7 +7414,7 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 /***/ (function(module, exports, __webpack_require__) {
 
 var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
- * Unipointer v2.3.0
+ * Unipointer v2.4.0
  * base class for doing one thing with pointer event
  * MIT license
  */
@@ -7442,12 +7461,13 @@ var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/*!
 
     // default to mouse events
     var startEvent = 'mousedown';
-    if (window.PointerEvent) {
+    if ('ontouchstart' in window) {
+      // HACK prefer Touch Events as you can preventDefault on touchstart to
+      // disable scroll in iOS & mobile Chrome metafizzy/flickity#1177
+      startEvent = 'touchstart';
+    } else if (window.PointerEvent) {
       // Pointer Events
       startEvent = 'pointerdown';
-    } else if ('ontouchstart' in window) {
-      // Touch Events. iOS Safari
-      startEvent = 'touchstart';
     }
     elem[bindMethod](startEvent, this);
   };
@@ -7833,10 +7853,12 @@ var pip = function pip() {
   };
 
   player.video.addEventListener('enterpictureinpicture', function (pipWindow) {
+    (0, _util.addClass)(player.root, 'xgplayer-pip-active');
     player.emit('requestPictureInPicture', pipWindow);
   });
 
   player.video.addEventListener('leavepictureinpicture', function () {
+    (0, _util.removeClass)(player.root, 'xgplayer-pip-active');
     player.emit('exitPictureInPicture');
   });
 
@@ -9643,7 +9665,7 @@ module.exports = exports['default'];
       Er = /^\:\:cue/,
       Pr = /^}+$/,
       jr = /^\[Script Info\].*/,
-      Mr = [/[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}-->[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}/, /[0-9]{2}:[0-9]{2}\.[0-9]{3}-->[0-9]{2}:[0-9]{2}\.[0-9]{3}/, /[0-9]{2}\.[0-9]{3}-->[0-9]{2}\.[0-9]{3}/],
+      Mr = [/[0-9]{1,3}:[0-9]{2}:[0-9]{2}\.[0-9]{1,3}-->[0-9]{1,3}:[0-9]{2}:[0-9]{2}\.[0-9]{1,3}/, /[0-9]{1,2}:[0-9]{2}\.[0-9]{1,3}-->[0-9]{1,2}:[0-9]{2}\.[0-9]{1,3}/, /[0-9]{1,2}\.[0-9]{1,3}-->[0-9]{1,2}\.[0-9]{1,3}/],
       Ar = /^Format:\s/,
       Cr = /^Style:\s/,
       Rr = /^Dialogue:\s/,
@@ -10470,6 +10492,7 @@ var s_definition = function s_definition() {
         return a.href === src;
       }
     });
+    console.warn('cursrc:', cursrc, 'src:', src, 'list:', list);
     tmp.push('</ul><p class=\'name\'>' + (cursrc[0] || { name: '' }).name + '</p>');
     var urlInRoot = root.querySelector('.xgplayer-definition');
     if (urlInRoot) {
@@ -13522,7 +13545,7 @@ var s_memoryPlay = function s_memoryPlay() {
       }, lastPlayTimeHideDelay * 1000);
     }
   };
-  player.once('play', handlePlay);
+  player.once('playing', handlePlay);
   player.once('ended', removeFunc);
 };