xgplayer 2.31.6 → 2.31.8

package/dist/index.js

@@ -1221,7 +1221,7 @@ module.exports = exports["default"];
 /* 8 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"version\":\"2.31.6\"}");
+module.exports = JSON.parse("{\"version\":\"2.31.8\"}");
 
 /***/ }),
 /* 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);
     }
   }, {
@@ -6503,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
@@ -7141,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
  */
@@ -7414,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
  */
@@ -7461,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);
   };
@@ -8093,6 +8094,7 @@ Object.defineProperty(exports, "__esModule", {
 var screenShot = function screenShot() {
   var player = this;
   var screenShotOptions = player.config.screenShot;
+  var callBack = null;
   if (!screenShotOptions) {
     return;
   }
@@ -8100,6 +8102,7 @@ var screenShot = function screenShot() {
   player.video.setAttribute('crossOrigin', 'anonymous');
 
   var encoderOptions = 0.92;
+
   if (screenShotOptions.quality || screenShotOptions.quality === 0) {
     encoderOptions = screenShotOptions.quality;
   }
@@ -8109,9 +8112,9 @@ var screenShot = function screenShot() {
   var canvas = document.createElement('canvas');
   var canvasCtx = canvas.getContext('2d');
   var img = new Image();
+
   canvas.width = this.config.width || 600;
   canvas.height = this.config.height || 337.5;
-
   var saveScreenShot = function saveScreenShot(data, filename) {
     var saveLink = document.createElement('a');
     saveLink.href = data;
@@ -8127,12 +8130,19 @@ var screenShot = function screenShot() {
     save = screenShotOptions.saveImg === undefined ? save : screenShotOptions.saveImg;
     canvas.width = player.video.videoWidth || 600;
     canvas.height = player.video.videoHeight || 337.5;
+    callBack = screenShotOptions.callBack;
     img.onload = function () {
       canvasCtx.drawImage(player.video, 0, 0, canvas.width, canvas.height);
       img.src = canvas.toDataURL(type, encoderOptions).replace(type, 'image/octet-stream');
       var screenShotImg = img.src.replace(/^data:image\/[^;]+/, 'data:application/octet-stream');
+      var saveFileName = screenShotOptions.fileName || player.lang.SCREENSHOT;
+
       player.emit('screenShot', screenShotImg);
-      save && saveScreenShot(screenShotImg, '截图' + format);
+      if (save && callBack) {
+        callBack(screenShotImg, saveFileName, format);
+      } else {
+        save && saveScreenShot(screenShotImg, saveFileName + format);
+      }
     }();
   };
   player.on('screenShotBtnClick', player.screenShot);
@@ -9664,7 +9674,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/,
@@ -10491,6 +10501,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) {