xgplayer 2.31.3 → 2.31.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xgplayer",
-    "version": "2.31.3",
+    "version": "2.31.7",
     "description": "video player",
     "main": "./dist/index.js",
     "typings": "./types/index.d.ts",
@@ -15,6 +15,7 @@
         "release:stable": "npm version patch && npm publish --registry=https://registry.npmjs.org",
         "release:alpha": "npm version prerelease --preid=alpha && npm publish --tag xgplayer-2-alpha --registry=https://registry.npmjs.org",
         "release:alpha-test": "npm publish --tag alpha-test-2x --registry=https://registry.npmjs.org"
+       
     },
     "keywords": [
         "video",

package/src/controls/memoryPlay.js

@@ -1,7 +1,10 @@
 let memoryPlay = function () {
   let player = this
   player.on('memoryPlayStart', (lastPlayTime) => {
-    player.currentTime = lastPlayTime
+    setTimeout(() => {
+      console.log('memoryPlayStart', lastPlayTime, player.readyState, 11)
+      player.currentTime = lastPlayTime
+    },)
   })
 }
 

package/src/controls/pip.js

@@ -1,5 +1,5 @@
 
-import { PresentationMode, checkWebkitSetPresentationMode } from '../utils/util'
+import { PresentationMode, checkWebkitSetPresentationMode, addClass, removeClass} from '../utils/util'
 
 let pip = function () {
   let player = this
@@ -25,10 +25,12 @@ let pip = function () {
   }
 
   player.video.addEventListener('enterpictureinpicture', function (pipWindow) {
+    addClass(player.root, 'xgplayer-pip-active')
     player.emit('requestPictureInPicture', pipWindow)
   })
 
   player.video.addEventListener('leavepictureinpicture', function () {
+    removeClass(player.root, 'xgplayer-pip-active')
     player.emit('exitPictureInPicture')
   })
 

package/src/player.js

@@ -330,12 +330,12 @@ class Player extends Proxy {
       allOff(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)
+
     super.destroy()
   }
 

package/src/proxy.js

@@ -487,6 +487,9 @@ class Proxy {
   get pip () {
     return hasClass(this.root, 'xgplayer-pip-active')
   }
+  get isMiniPlayer () {
+    return hasClass(this.root, 'xgplayer-miniplayer-active')
+  }
 }
 
 export default Proxy

package/src/skin/controls/definition.js

@@ -56,6 +56,7 @@ let s_definition = function () {
         return a.href === src
       }
     })
+    console.warn('cursrc:', cursrc, 'src:', src, 'list:', list)
     tmp.push(`</ul><p class='name'>${(cursrc[0] || {name: ''}).name}</p>`)
     let urlInRoot = root.querySelector('.xgplayer-definition')
     if (urlInRoot) {

package/src/skin/controls/memoryPlay.js

@@ -29,7 +29,7 @@ let s_memoryPlay = function () {
       }, lastPlayTimeHideDelay * 1000)
     }
   }
-  player.once('play', handlePlay)
+  player.once('playing', handlePlay)
   player.once('ended', removeFunc)
 }
 

package/src/skin/controls/playNext.js

@@ -26,7 +26,7 @@ let s_playNext = function () {
   let onUrlListEnd = function () {
     addClass(player.root, 'xgplayer-playnext-inactive')
   }
-  player.on('urlListEnd', onUrlListEnd)
+  player.on('urlListEnd', onUrlListEnd) 
 
   function onDestroy () {
     player.off('urlListEnd', onUrlListEnd)

package/src/skin/controls/progress.js

@@ -166,8 +166,12 @@ let s_progress = function () {
       player.config.enableSwipeHandler.call(player);
     });
   };
-
-  ['touchstart', 'mousedown'].forEach(item => {
+  let events = ['touchstart', 'mousedown'];
+  if (sniffer.device === 'mobile') {
+    // 解决在移动端触发多次seeking问题
+    events.pop()
+  }
+  events.forEach(item => {
     container.addEventListener(item, function (e) {
       if (player.config.disableProgress) return;
       // e.preventDefault()
@@ -205,6 +209,7 @@ let s_progress = function () {
           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 {
             let time = findDom(player.controls, '.xgplayer-time')
@@ -230,6 +235,7 @@ let s_progress = function () {
         player.emit('focus')
       }
       let up = function (e) {
+        console.log('up event', e)
         // e.preventDefault()
         e.stopPropagation()
         event(e)
@@ -250,6 +256,7 @@ let s_progress = function () {
           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)
           }
         }
@@ -259,10 +266,14 @@ let s_progress = function () {
         player.emit('focus')
         player.isProgressMoving = false
       }
-      window.addEventListener('mousemove', move)
-      window.addEventListener('touchmove', move, { passive: false })
-      window.addEventListener('mouseup', up)
-      window.addEventListener('touchend', up)
+      // if (item === 'touchstart') {
+        window.addEventListener('touchmove', move, { passive: false })
+        window.addEventListener('touchend', up)
+      // } else {
+        window.addEventListener('mousemove', move)
+        // console.warn('add envent mouseup')
+        window.addEventListener('mouseup', up)
+      // }
       return true
     })
   })

package/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.31.3"
+  "version": "2.31.7"
 }

package/webpack.config.js

@@ -160,4 +160,4 @@ const client_controls = controls.map(key => {
   }
 })
 
-module.exports = [umd, umd_es6, client].concat(umd_es6_controls)
+module.exports = [umd, umd_es6, client].concat(umd_es6_controls, umd_controls, client_controls)