xgplayer 2.32.0 → 2.32.2

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "xgplayer",
-    "version": "2.32.0",
+    "version": "2.32.2",
     "description": "video player",
     "main": "./dist/index.js",
     "typings": "./types/index.d.ts",
@@ -29,7 +29,7 @@
     "dependencies": {
         "chalk": "^2.3.2",
         "commander": "^2.15.1",
-        "danmu.js": "^1.1.1",
+        "danmu.js": "^1.1.2",
         "downloadjs": "1.4.7",
         "draggabilly": "^2.2.0",
         "event-emitter": "^0.3.5",
@@ -57,11 +57,11 @@
         "core-js": "^2.5.4",
         "css-loader": "^0.28.11",
         "json-loader": "^0.5.7",
-        "node-sass": "^4.8.3",
         "postcss-cssnext": "^3.1.0",
         "postcss-loader": "^2.1.5",
         "raw-loader": "^2.0.0",
-        "sass-loader": "^6.0.7",
+        "sass": "^1.56.1",
+        "sass-loader": "^10.3.1",
         "style-loader": "^0.20.3",
         "sugarss": "^1.0.1",
         "uglifyjs-webpack-plugin": "^2.2.0",

package/src/controls/screenShot.js

@@ -1,6 +1,7 @@
 let screenShot = function () {
   let player = this
   let screenShotOptions = player.config.screenShot
+  let callBack = null
   if (!screenShotOptions) {
     return
   }
@@ -8,7 +9,8 @@ let screenShot = function () {
   player.video.setAttribute('crossOrigin', 'anonymous')
 
   let encoderOptions = 0.92
-  if(screenShotOptions.quality || screenShotOptions.quality === 0) {
+
+  if (screenShotOptions.quality || screenShotOptions.quality === 0) {
     encoderOptions = screenShotOptions.quality
   }
   let type = screenShotOptions.type === undefined ? 'image/png' : screenShotOptions.type
@@ -17,9 +19,9 @@ let screenShot = function () {
   let canvas = document.createElement('canvas')
   let canvasCtx = canvas.getContext('2d')
   let img = new Image()
-  canvas.width = this.config.width || 600
-  canvas.height = this.config.height || 337.5
 
+  canvas.width = this.config.width || 600
+  canvas.height = this.config.height || 337.5  
   let saveScreenShot = function (data, filename) {
     let saveLink = document.createElement('a')
     saveLink.href = data
@@ -33,12 +35,19 @@ let screenShot = function () {
     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')
       let screenShotImg = img.src.replace(/^data:image\/[^;]+/, 'data:application/octet-stream')
+      let 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)

package/src/skin/style/controls/danmu.scss

@@ -14,10 +14,12 @@
     overflow: hidden;
     z-index: 9;
     outline: none;
+    pointer-events: none;
     > * {
       position: absolute;
       white-space: nowrap;
       z-index: 9;
+      pointer-events: auto;
     }
   }
 }

package/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "2.32.0"
+  "version": "2.32.2"
 }

package/webpack.config.js

@@ -16,35 +16,40 @@ const rules = [{
       }
     },
     'postcss-loader',
-    'sass-loader'
+    {
+      loader: 'sass-loader',
+      options: {
+        implementation: require('sass')
+      }
+    }
   ]
 }, {
   test: /\.svg/,
   loader: 'raw-loader'
-}];
+}]
 
 const umdModuleConfig = {
   rules
-};
+}
 
 const babelModuleConfig = {
   rules: rules.concat({
-    test:/\.(js|jsx)$/,
-    use:{
-      loader:'babel-loader',
-      options:{
-        presets:[
+    test: /\.(js|jsx)$/,
+    use: {
+      loader: 'babel-loader',
+      options: {
+        presets: [
           'es2015'
         ],
         plugins: [
-          "add-module-exports",
-          "babel-plugin-bulk-import"
+          'add-module-exports',
+          'babel-plugin-bulk-import'
         ]
       }
     },
-    exclude:/node_modules/
+    exclude: /node_modules/
   })
-};
+}
 
 const umd = {
   entry: {
@@ -107,10 +112,10 @@ const client = {
   }
 }
 
-const controls = ['airplay', 'cssFullscreen', 'danmu', 'definition', 'download', 'enter', 'error', 'errorRetry', 
-  'flex', 'fullscreen', 'i18n', 'keyboard', 'loading', 'localPreview', 'memoryPlay', 'miniplayer', 'mobile', 'pc', 
-  'pip', 'play', 'playbackRate', 'playNext', 'poster', 'progress', 'reload', 'replay', 'rotate', 'screenShot', 
-  'start', 'textTrack', 'nativeTextTrack', 'time', 'volume'];
+const controls = ['airplay', 'cssFullscreen', 'danmu', 'definition', 'download', 'enter', 'error', 'errorRetry',
+  'flex', 'fullscreen', 'i18n', 'keyboard', 'loading', 'localPreview', 'memoryPlay', 'miniplayer', 'mobile', 'pc',
+  'pip', 'play', 'playbackRate', 'playNext', 'poster', 'progress', 'reload', 'replay', 'rotate', 'screenShot',
+  'start', 'textTrack', 'nativeTextTrack', 'time', 'volume']
 
 const umd_es6_controls = controls.map(key => {
   return {