修复切换画质bug

docs/lab/js/artplayer.js

@@ -1109,13 +1109,13 @@
     var $video = art.refs.$video,
         i18n = art.i18n,
         notice = art.notice,
-        isPlaying = art.isPlaying,
         option = art.option;
-    Object.defineProperty(player, 'switch', {
+    Object.defineProperty(player, 'switchQuality', {
       value: function value(url) {
         var name = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'unknown';
 
         if (url !== option.url) {
+          var isPlaying = art.isPlaying;
           var currentTime = player.currentTime;
           art.emit('beforeMountUrl', url);
           $video.src = player.mountUrl(url);
@@ -2893,15 +2893,6 @@
         });
       }
     });
-    Object.defineProperty(player, 'pipToggle', {
-      value: function value() {
-        if (player.pipState) {
-          player.pipExit();
-        } else {
-          player.pipEnabled();
-        }
-      }
-    });
     proxy($video, 'enterpictureinpicture', function () {
       art.emit('pipEnabled');
     });
@@ -2976,6 +2967,15 @@
         }
       }
     });
+  }
+
+  function pipMix(art, player) {
+    if (document.pictureInPictureEnabled) {
+      nativePip(art, player);
+    } else {
+      customPip(art, player);
+    }
+
     Object.defineProperty(player, 'pipToggle', {
       value: function value() {
         if (player.pipState) {
@@ -2987,14 +2987,6 @@
     });
   }
 
-  function pipMix(art, player) {
-    if (document.pictureInPictureEnabled) {
-      nativePip(art, player);
-    } else {
-      customPip(art, player);
-    }
-  }
-
   function seekMix$1(art, player) {
     Object.defineProperty(player, 'loaded', {
       get: function get() {
@@ -3843,7 +3835,7 @@
               name = _option$quality$index.name;
 
           if (url && name && _this.playIndex !== index) {
-            player.switch(url, name);
+            player.switchQuality(url, name);
             $qualityName.innerHTML = name;
             _this.playIndex = index;
           }

docs/lab/js/artplayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"artplayer.js","sources":["../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/toConsumableArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/classCallCheck.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/createClass.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/typeof.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/inherits.js","../../../packages/artplayer/node_modules/tiny-emitter/index.js","../../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../../packages/artplayer/node_modules/deepmerge/dist/es.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/isNativeFunction.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/construct.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../../packages/artplayer/src/utils/index.js","../../../packages/artplayer/src/scheme/validElement.js","../../../packages/artplayer/src/scheme/validStringEmpty.js","../../../packages/artplayer/src/scheme/index.js","../../../packages/artplayer/src/config/mimeCodec.js","../../../packages/artplayer/src/config/mse.js","../../../packages/artplayer/src/config/video.js","../../../packages/artplayer/src/config/index.js","../../../packages/artplayer/src/template.js","../../../packages/artplayer/src/i18n.js","../../../packages/artplayer/src/player/mountUrlMix.js","../../../packages/artplayer/src/player/attrInit.js","../../../packages/artplayer/src/player/eventInit.js","../../../packages/artplayer/src/player/playMix.js","../../../packages/artplayer/src/player/pauseMin.js","../../../packages/artplayer/src/player/toggleMix.js","../../../packages/artplayer/src/player/seekMix.js","../../../packages/artplayer/src/player/volumeMix.js","../../../packages/artplayer/src/player/currentTimeMix.js","../../../packages/artplayer/src/player/durationMix.js","../../../packages/artplayer/src/player/switchMix.js","../../../packages/artplayer/src/player/playbackRateMix.js","../../../packages/artplayer/src/player/aspectRatioMix.js","../../../packages/artplayer/src/player/screenshotMix.js","../../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../../packages/artplayer/src/player/fullscreenMix.js","../../../packages/artplayer/src/player/fullscreenWebMix.js","../../../packages/artplayer/node_modules/get-size/get-size.js","../../../packages/artplayer/node_modules/ev-emitter/ev-emitter.js","../../../packages/artplayer/node_modules/unipointer/unipointer.js","../../../packages/artplayer/node_modules/unidragger/unidragger.js","../../../packages/artplayer/node_modules/draggabilly/draggabilly.js","../../../packages/artplayer/src/player/pipMix.js","../../../packages/artplayer/src/player/loadedMix.js","../../../packages/artplayer/src/player/playedMix.js","../../../packages/artplayer/src/player/autoSizeMix.js","../../../packages/artplayer/src/player/flipMix.js","../../../packages/artplayer/src/player/index.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArrayLimit.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableRest.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/slicedToArray.js","../../../packages/artplayer/src/icons/index.js","../../../packages/artplayer/src/controls/fullscreen.js","../../../packages/artplayer/src/controls/fullscreenWeb.js","../../../packages/artplayer/src/controls/pip.js","../../../packages/artplayer/src/controls/playAndPause.js","../../../packages/artplayer/src/controls/progress.js","../../../packages/artplayer/src/controls/subtitle.js","../../../packages/artplayer/src/controls/time.js","../../../packages/artplayer/src/controls/volume.js","../../../packages/artplayer/src/controls/setting.js","../../../packages/artplayer/src/controls/thumbnails.js","../../../packages/artplayer/src/controls/screenshot.js","../../../packages/artplayer/src/controls/quality.js","../../../packages/artplayer/src/controls/index.js","../../../packages/artplayer/src/contextmenu/playbackRate.js","../../../packages/artplayer/src/contextmenu/aspectRatio.js","../../../packages/artplayer/src/contextmenu/info.js","../../../packages/artplayer/src/contextmenu/version.js","..Line truncated
+{"version":3,"file":"artplayer.js","sources":["../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/toConsumableArray.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/classCallCheck.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/createClass.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/typeof.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/inherits.js","../../../packages/artplayer/node_modules/tiny-emitter/index.js","../../../packages/artplayer/node_modules/option-validator/dist/option-validator.js","../../../packages/artplayer/node_modules/deepmerge/dist/es.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/isNativeFunction.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/construct.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../../packages/artplayer/src/utils/index.js","../../../packages/artplayer/src/scheme/validElement.js","../../../packages/artplayer/src/scheme/validStringEmpty.js","../../../packages/artplayer/src/scheme/index.js","../../../packages/artplayer/src/config/mimeCodec.js","../../../packages/artplayer/src/config/mse.js","../../../packages/artplayer/src/config/video.js","../../../packages/artplayer/src/config/index.js","../../../packages/artplayer/src/template.js","../../../packages/artplayer/src/i18n.js","../../../packages/artplayer/src/player/mountUrlMix.js","../../../packages/artplayer/src/player/attrInit.js","../../../packages/artplayer/src/player/eventInit.js","../../../packages/artplayer/src/player/playMix.js","../../../packages/artplayer/src/player/pauseMin.js","../../../packages/artplayer/src/player/toggleMix.js","../../../packages/artplayer/src/player/seekMix.js","../../../packages/artplayer/src/player/volumeMix.js","../../../packages/artplayer/src/player/currentTimeMix.js","../../../packages/artplayer/src/player/durationMix.js","../../../packages/artplayer/src/player/switchQualityMix.js","../../../packages/artplayer/src/player/playbackRateMix.js","../../../packages/artplayer/src/player/aspectRatioMix.js","../../../packages/artplayer/src/player/screenshotMix.js","../../../packages/artplayer/node_modules/screenfull/dist/screenfull.js","../../../packages/artplayer/src/player/fullscreenMix.js","../../../packages/artplayer/src/player/fullscreenWebMix.js","../../../packages/artplayer/node_modules/get-size/get-size.js","../../../packages/artplayer/node_modules/ev-emitter/ev-emitter.js","../../../packages/artplayer/node_modules/unipointer/unipointer.js","../../../packages/artplayer/node_modules/unidragger/unidragger.js","../../../packages/artplayer/node_modules/draggabilly/draggabilly.js","../../../packages/artplayer/src/player/pipMix.js","../../../packages/artplayer/src/player/loadedMix.js","../../../packages/artplayer/src/player/playedMix.js","../../../packages/artplayer/src/player/autoSizeMix.js","../../../packages/artplayer/src/player/flipMix.js","../../../packages/artplayer/src/player/index.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/arrayWithHoles.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/iterableToArrayLimit.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/nonIterableRest.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/slicedToArray.js","../../../packages/artplayer/src/icons/index.js","../../../packages/artplayer/src/controls/fullscreen.js","../../../packages/artplayer/src/controls/fullscreenWeb.js","../../../packages/artplayer/src/controls/pip.js","../../../packages/artplayer/src/controls/playAndPause.js","../../../packages/artplayer/src/controls/progress.js","../../../packages/artplayer/src/controls/subtitle.js","../../../packages/artplayer/src/controls/time.js","../../../packages/artplayer/src/controls/volume.js","../../../packages/artplayer/src/controls/setting.js","../../../packages/artplayer/src/controls/thumbnails.js","../../../packages/artplayer/src/controls/screenshot.js","../../../packages/artplayer/src/controls/quality.js","../../../packages/artplayer/src/controls/index.js","../../../packages/artplayer/src/contextmenu/playbackRate.js","../../../packages/artplayer/src/contextmenu/aspectRatio.js","../../../packages/artplayer/src/contextmenu/info.js","../../../packages/artplayer/src/contextmenu/version.Line truncated

packages/artplayer-plugin-danmu/rollup.config.js

@@ -10,56 +10,54 @@ const replace = require('rollup-plugin-replace');
 const svgo = require('rollup-plugin-svgo');
 const { uglify } = require('rollup-plugin-uglify');
 const { version, homepage, name } = require('./package.json');
+
 const isProd = process.env.NODE_ENV === 'production';
 
 const banner =
-  '/*!\n' +
+    '/*!\n' +
-  ` * ${name}.js v${version}\n` +
+    ` * ${name}.js v${version}\n` +
-  ` * Github: ${homepage}\n` +
+    ` * Github: ${homepage}\n` +
-  ` * (c) 2017-${new Date().getFullYear()} Harvey Zack\n` +
+    ` * (c) 2017-${new Date().getFullYear()} Harvey Zack\n` +
-  ' * Released under the MIT License.\n' +
+    ' * Released under the MIT License.\n' +
-  ' */\n';
+    ' */\n';
 
 export default {
-  input: 'src/index.js',
+    input: 'src/index.js',
-  output: {
+    output: {
-    name: name,
+        name,
-    file: isProd ? `dist/${name}.js` : path.join(process.cwd(), '../../', `docs/lab/js/${name}.js`),
+        file: isProd ? `dist/${name}.js` : path.join(process.cwd(), '../../', `docs/lab/js/${name}.js`),
-    format: 'umd',
+        format: 'umd',
-    exports: 'named'
+        exports: 'named',
-  },
+    },
-  plugins: [
+    plugins: [
-    eslint({
+        eslint({
-      exclude: [
+            exclude: ['node_modules/**', 'src/**/*.scss', 'src/**/*.svg'],
-        'node_modules/**',
+        }),
-        'src/**/*.scss',
+        postcss({
-        'src/**/*.svg'
+            plugins: [autoprefixer, cssnano],
-      ]
+            extract: isProd ? `dist/${name}.css` : path.join(process.cwd(), '../../', `docs/lab/css/${name}.css`),
-    }),
+        }),
-    postcss({
+        nodeResolve(),
-      plugins: [autoprefixer, cssnano],
+        commonjs(),
-      extract: isProd ? `dist/${name}.css` : path.join(process.cwd(), '../../', `docs/lab/css/${name}.css`)
+        babel({
-    }),
+            runtimeHelpers: true,
-    nodeResolve(),
+            exclude: 'node_modules/**',
-    commonjs(),
+            presets: [['@babel/env', { modules: false }]],
-    babel({
+            plugins: ['@babel/plugin-external-helpers', '@babel/plugin-transform-runtime'],
-      runtimeHelpers: true,
+        }),
-      exclude: 'node_modules/**',
+        svgo({
-      presets: [['@babel/env', { modules: false }]],
+            raw: true,
-      plugins: ['@babel/plugin-external-helpers', '@babel/plugin-transform-runtime']
+        }),
-    }),
+        replace({
-    svgo({
+            exclude: 'node_modules/**',
-      raw: true
+            __ENV__: JSON.stringify(process.env.NODE_ENV || 'development'),
-    }),
+            __VERSION__: version,
-    replace({
+        }),
-      exclude: 'node_modules/**',
+        isProd &&
-      __ENV__: JSON.stringify(process.env.NODE_ENV || 'development'),
+            uglify({
-      __VERSION__: version
+                output: {
-    }),
+                    preamble: banner,
-    isProd && uglify({
+                },
-      output: {
+            }),
-        preamble: banner
+    ],
-      }
-    })
-  ]
 };

packages/artplayer/rollup.config.js

@@ -10,56 +10,54 @@ const replace = require('rollup-plugin-replace');
 const svgo = require('rollup-plugin-svgo');
 const { uglify } = require('rollup-plugin-uglify');
 const { version, homepage, name } = require('./package.json');
+
 const isProd = process.env.NODE_ENV === 'production';
 
 const banner =
-  '/*!\n' +
+    '/*!\n' +
-  ` * ${name}.js v${version}\n` +
+    ` * ${name}.js v${version}\n` +
-  ` * Github: ${homepage}\n` +
+    ` * Github: ${homepage}\n` +
-  ` * (c) 2017-${new Date().getFullYear()} Harvey Zack\n` +
+    ` * (c) 2017-${new Date().getFullYear()} Harvey Zack\n` +
-  ' * Released under the MIT License.\n' +
+    ' * Released under the MIT License.\n' +
-  ' */\n';
+    ' */\n';
 
 export default {
-  input: 'src/index.js',
+    input: 'src/index.js',
-  output: {
+    output: {
-    name: name,
+        name,
-    file: isProd ? `dist/${name}.js` : path.join(process.cwd(), '../../', `docs/lab/js/${name}.js`),
+        file: isProd ? `dist/${name}.js` : path.join(process.cwd(), '../../', `docs/lab/js/${name}.js`),
-    format: 'umd',
+        format: 'umd',
-    exports: 'named'
+        exports: 'named',
-  },
+    },
-  plugins: [
+    plugins: [
-    eslint({
+        eslint({
-      exclude: [
+            exclude: ['node_modules/**', 'src/**/*.scss', 'src/**/*.svg'],
-        'node_modules/**',
+        }),
-        'src/**/*.scss',
+        postcss({
-        'src/**/*.svg'
+            plugins: [autoprefixer, cssnano],
-      ]
+            extract: isProd ? `dist/${name}.css` : path.join(process.cwd(), '../../', `docs/lab/css/${name}.css`),
-    }),
+        }),
-    postcss({
+        nodeResolve(),
-      plugins: [autoprefixer, cssnano],
+        commonjs(),
-      extract: isProd ? `dist/${name}.css` : path.join(process.cwd(), '../../', `docs/lab/css/${name}.css`)
+        babel({
-    }),
+            runtimeHelpers: true,
-    nodeResolve(),
+            exclude: 'node_modules/**',
-    commonjs(),
+            presets: [['@babel/env', { modules: false }]],
-    babel({
+            plugins: ['@babel/plugin-external-helpers', '@babel/plugin-transform-runtime'],
-      runtimeHelpers: true,
+        }),
-      exclude: 'node_modules/**',
+        svgo({
-      presets: [['@babel/env', { modules: false }]],
+            raw: true,
-      plugins: ['@babel/plugin-external-helpers', '@babel/plugin-transform-runtime']
+        }),
-    }),
+        replace({
-    svgo({
+            exclude: 'node_modules/**',
-      raw: true
+            __ENV__: JSON.stringify(process.env.NODE_ENV || 'development'),
-    }),
+            __VERSION__: version,
-    replace({
+        }),
-      exclude: 'node_modules/**',
+        isProd &&
-      __ENV__: JSON.stringify(process.env.NODE_ENV || 'development'),
+            uglify({
-      __VERSION__: version
+                output: {
-    }),
+                    preamble: banner,
-    isProd && uglify({
+                },
-      output: {
+            }),
-        preamble: banner
+    ],
-      }
-    })
-  ]
 };

packages/artplayer/src/controls/quality.js

@@ -34,7 +34,7 @@ export default class Quality {
             const index = Number(event.target.dataset.index);
             const { url, name } = option.quality[index];
             if (url && name && this.playIndex !== index) {
-                player.switch(url, name);
+                player.switchQuality(url, name);
                 $qualityName.innerHTML = name;
                 this.playIndex = index;
             }

packages/artplayer/src/player/index.js

@@ -8,7 +8,7 @@ import seekMix from './seekMix';
 import volumeMix from './volumeMix';
 import currentTimeMix from './currentTimeMix';
 import durationMix from './durationMix';
-import switchMix from './switchMix';
+import switchQualityMix from './switchQualityMix';
 import playbackRateMix from './playbackRateMix';
 import aspectRatioMix from './aspectRatioMix';
 import screenshotMix from './screenshotMix';
@@ -32,7 +32,7 @@ export default class Player {
         volumeMix(art, this);
         currentTimeMix(art, this);
         durationMix(art, this);
-        switchMix(art, this);
+        switchQualityMix(art, this);
         playbackRateMix(art, this);
         aspectRatioMix(art, this);
         screenshotMix(art, this);

packages/artplayer/src/player/pipMix.js

@@ -32,16 +32,6 @@ function nativePip(art, player) {
         },
     });
 
-    Object.defineProperty(player, 'pipToggle', {
-        value: () => {
-            if (player.pipState) {
-                player.pipExit();
-            } else {
-                player.pipEnabled();
-            }
-        },
-    });
-
     proxy($video, 'enterpictureinpicture', () => {
         art.emit('pipEnabled');
     });
@@ -117,6 +107,14 @@ function customPip(art, player) {
             }
         },
     });
+}
+
+export default function pipMix(art, player) {
+    if (document.pictureInPictureEnabled) {
+        nativePip(art, player);
+    } else {
+        customPip(art, player);
+    }
 
     Object.defineProperty(player, 'pipToggle', {
         value: () => {
@@ -128,11 +126,3 @@ function customPip(art, player) {
         },
     });
 }
-
-export default function pipMix(art, player) {
-    if (document.pictureInPictureEnabled) {
-        nativePip(art, player);
-    } else {
-        customPip(art, player);
-    }
-}

packages/artplayer/src/player/switchQualityMix.js

@@ -3,13 +3,13 @@ export default function switchMix(art, player) {
         refs: { $video },
         i18n,
         notice,
-        isPlaying,
         option,
     } = art;
 
-    Object.defineProperty(player, 'switch', {
+    Object.defineProperty(player, 'switchQuality', {
         value: (url, name = 'unknown') => {
             if (url !== option.url) {
+                const { isPlaying } = art;
                 const { currentTime } = player;
                 art.emit('beforeMountUrl', url);
                 $video.src = player.mountUrl(url);