限制参数范围

docs/lab/js/artplayer.js

@@ -1159,11 +1159,17 @@
     });
     Object.defineProperty(player, 'playbackRate', {
       value: function value(rate) {
-        var newRate = clamp(rate, 0.1, 10);
-        $video.playbackRate = newRate;
-        $player.dataset.playbackRate = newRate;
-        notice.show("".concat(i18n.get('Rate'), ": ").concat(newRate === 1 ? i18n.get('Normal') : "".concat(newRate, "x")));
-        art.emit('playbackRateChange', newRate);
+        var rateList = [0.5, 0.75, 1.0, 1.25, 1.5, 2.0];
+        errorHandle(rateList.includes(rate), "'playbackRate' only accept ".concat(rateList.toString(), " as parameters"));
+
+        if (rate === $player.dataset.playbackRate) {
+          return;
+        }
+
+        $video.playbackRate = rate;
+        $player.dataset.playbackRate = rate;
+        notice.show("".concat(i18n.get('Rate'), ": ").concat(rate, "x"));
+        art.emit('playbackRateChange', rate);
       }
     });
     Object.defineProperty(player, 'playbackRateRemove', {
@@ -1200,15 +1206,23 @@
     });
     Object.defineProperty(player, 'aspectRatio', {
       value: function value(ratio) {
-        var ratioName = ratio.length === 2 ? "".concat(ratio[0], ":").concat(ratio[1]) : i18n.get('Default');
+        var ratioList = ['default', '4:3', '16:9'];
+        errorHandle(ratioList.includes(ratio), "'aspectRatio' only accept ".concat(ratioList.toString(), " as parameters"));
 
-        if (ratio.length === 2) {
+        if (ratio === $player.dataset.aspectRatio) {
+          return;
+        }
+
+        if (ratio === 'default') {
+          player.aspectRatioRemove();
+        } else {
+          var ratioArray = ratio.split(':');
           var videoWidth = $video.videoWidth,
               videoHeight = $video.videoHeight;
           var clientWidth = $player.clientWidth,
               clientHeight = $player.clientHeight;
           var videoRatio = videoWidth / videoHeight;
-          var setupRatio = Number(ratio[0]) / Number(ratio[1]);
+          var setupRatio = ratioArray[0] / ratioArray[1];
 
           if (videoRatio > setupRatio) {
             var percentage = setupRatio * videoHeight / videoWidth;
@@ -1222,13 +1236,10 @@
             setStyle($video, 'height', "".concat(_percentage * 100, "%"));
             setStyle($video, 'padding', "".concat((clientHeight - clientHeight * _percentage) / 2, "px 0"));
           }
-
-          $player.dataset.aspectRatio = ratioName;
-        } else {
-          player.aspectRatioRemove();
         }
 
-        notice.show("".concat(i18n.get('Aspect ratio'), ": ").concat(ratioName));
+        $player.dataset.aspectRatio = ratio;
+        notice.show("".concat(i18n.get('Aspect ratio'), ": ").concat(ratio));
         art.emit('aspectRatioChange', ratio);
       }
     });
@@ -3070,7 +3081,7 @@
     Object.defineProperty(player, 'flip', {
       value: function value(flip) {
         var flipList = ['normal', 'horizontal', 'vertical'];
-        errorHandle(flipList.includes(flip), "The 'angle' need to be one of '[normal, horizontal, vertical]', but got ".concat(flip));
+        errorHandle(flipList.includes(flip), "'flip' only accept ".concat(flipList.toString(), " as parameters"));
         art.refs.$player.dataset.flip = flip;
         art.emit('flipChange', flip);
       }
@@ -3949,7 +3960,7 @@
       var i18n = art.i18n,
           player = art.player;
       return objectSpread({}, menuOption, {
-        html: "\n                ".concat(i18n.get('Play speed'), ":\n                <span data-rate=\"0.5\">0.5</span>\n                <span data-rate=\"0.75\">0.75</span>\n                <span data-rate=\"1\" class=\"normal current\">").concat(i18n.get('Normal'), "</span>\n                <span data-rate=\"1.25\">1.25</span>\n                <span data-rate=\"1.5\">1.5</span>\n                <span data-rate=\"2.0\">2.0</span>\n            "),
+        html: "\n                ".concat(i18n.get('Play speed'), ":\n                <span data-rate=\"0.5\">0.5</span>\n                <span data-rate=\"0.75\">0.75</span>\n                <span data-rate=\"1.0\" class=\"normal current\">").concat(i18n.get('Normal'), "</span>\n                <span data-rate=\"1.25\">1.25</span>\n                <span data-rate=\"1.5\">1.5</span>\n                <span data-rate=\"2.0\">2.0</span>\n            "),
         click: function click(event) {
           var target = event.target;
           var rate = target.dataset.rate;
@@ -3982,14 +3993,14 @@
           var ratio = target.dataset.ratio;
 
           if (ratio) {
-            player.aspectRatio(ratio.split(':'));
+            player.aspectRatio(ratio);
             art.contextmenu.hide();
           }
         },
         mounted: function mounted($menu) {
           art.on('aspectRatioChange', function (ratio) {
             var $current = Array.from($menu.querySelectorAll('span')).find(function (item) {
-              return item.dataset.ratio === ratio.join(':');
+              return item.dataset.ratio === ratio;
             });
             inverseClass($current, 'current');
           });

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/error.js","../../../packages/artplayer/src/utils/dom.js","../../../packages/artplayer/src/utils/subtitle.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/src/utils/component.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/defineProperty.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/objectSpread.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/artplayLine 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/error.js","../../../packages/artplayer/src/utils/dom.js","../../../packages/artplayer/src/utils/subtitle.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/src/utils/component.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/defineProperty.js","../../../packages/artplayer/node_modules/@babel/runtime/helpers/objectSpread.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/artplayLine truncated

packages/artplayer/src/contextmenu/aspectRatio.js

@@ -15,14 +15,14 @@ export default function aspectRatio(menuOption) {
                 const { target } = event;
                 const { ratio } = target.dataset;
                 if (ratio) {
-                    player.aspectRatio(ratio.split(':'));
+                    player.aspectRatio(ratio);
                     art.contextmenu.hide();
                 }
             },
             mounted: $menu => {
                 art.on('aspectRatioChange', ratio => {
                     const $current = Array.from($menu.querySelectorAll('span')).find(
-                        item => item.dataset.ratio === ratio.join(':'),
+                        item => item.dataset.ratio === ratio,
                     );
                     inverseClass($current, 'current');
                 });

packages/artplayer/src/contextmenu/playbackRate.js

@@ -9,7 +9,7 @@ export default function playbackRate(menuOption) {
                 ${i18n.get('Play speed')}:
                 <span data-rate="0.5">0.5</span>
                 <span data-rate="0.75">0.75</span>
-                <span data-rate="1" class="normal current">${i18n.get('Normal')}</span>
+                <span data-rate="1.0" class="normal current">${i18n.get('Normal')}</span>
                 <span data-rate="1.25">1.25</span>
                 <span data-rate="1.5">1.5</span>
                 <span data-rate="2.0">2.0</span>

packages/artplayer/src/player/aspectRatioMix.js

@@ -1,4 +1,4 @@
-import { setStyle } from '../utils';
+import { setStyle, errorHandle } from '../utils';
 
 export default function aspectRatioMix(art, player) {
     const {
@@ -13,14 +13,21 @@ export default function aspectRatioMix(art, player) {
 
     Object.defineProperty(player, 'aspectRatio', {
         value: ratio => {
-            const ratioName = ratio.length === 2 ? `${ratio[0]}:${ratio[1]}` : i18n.get('Default');
+            const ratioList = ['default', '4:3', '16:9'];
+            errorHandle(ratioList.includes(ratio), `'aspectRatio' only accept ${ratioList.toString()} as parameters`);
+            
+            if (ratio === $player.dataset.aspectRatio) {
+                return;
+            }
 
-            if (ratio.length === 2) {
+            if (ratio === 'default') {
+                player.aspectRatioRemove();
+            } else {
+                const ratioArray = ratio.split(':');
                 const { videoWidth, videoHeight } = $video;
                 const { clientWidth, clientHeight } = $player;
                 const videoRatio = videoWidth / videoHeight;
-                const setupRatio = Number(ratio[0]) / Number(ratio[1]);
-
+                const setupRatio = ratioArray[0] / ratioArray[1];
                 if (videoRatio > setupRatio) {
                     const percentage = (setupRatio * videoHeight) / videoWidth;
                     setStyle($video, 'width', `${percentage * 100}%`);
@@ -32,13 +39,10 @@ export default function aspectRatioMix(art, player) {
                     setStyle($video, 'height', `${percentage * 100}%`);
                     setStyle($video, 'padding', `${(clientHeight - clientHeight * percentage) / 2}px 0`);
                 }
-
-                $player.dataset.aspectRatio = ratioName;
-            } else {
-                player.aspectRatioRemove();
             }
 
-            notice.show(`${i18n.get('Aspect ratio')}: ${ratioName}`);
+            $player.dataset.aspectRatio = ratio;
+            notice.show(`${i18n.get('Aspect ratio')}: ${ratio}`);
             art.emit('aspectRatioChange', ratio);
         },
     });

packages/artplayer/src/player/flipMix.js

@@ -8,10 +8,7 @@ export default function flipMix(art, player) {
     Object.defineProperty(player, 'flip', {
         value: flip => {
             const flipList = ['normal', 'horizontal', 'vertical'];
-            errorHandle(
-                flipList.includes(flip),
-                `The 'angle' need to be one of '[normal, horizontal, vertical]', but got ${flip}`,
-            );
+            errorHandle(flipList.includes(flip), `'flip' only accept ${flipList.toString()} as parameters`);
             art.refs.$player.dataset.flip = flip;
             art.emit('flipChange', flip);
         },

packages/artplayer/src/player/playbackRateMix.js

@@ -1,4 +1,4 @@
-import { clamp } from '../utils';
+import { errorHandle } from '../utils';
 
 export default function playbackRateMix(art, player) {
     const {
@@ -13,11 +13,17 @@ export default function playbackRateMix(art, player) {
 
     Object.defineProperty(player, 'playbackRate', {
         value: rate => {
-            const newRate = clamp(rate, 0.1, 10);
-            $video.playbackRate = newRate;
-            $player.dataset.playbackRate = newRate;
-            notice.show(`${i18n.get('Rate')}: ${newRate === 1 ? i18n.get('Normal') : `${newRate}x`}`);
-            art.emit('playbackRateChange', newRate);
+            const rateList = [0.5, 0.75, 1.0, 1.25, 1.5, 2.0];
+            errorHandle(rateList.includes(rate), `'playbackRate' only accept ${rateList.toString()} as parameters`);
+
+            if (rate === $player.dataset.playbackRate) {
+                return;
+            }
+
+            $video.playbackRate = rate;
+            $player.dataset.playbackRate = rate;
+            notice.show(`${i18n.get('Rate')}: ${rate}x`);
+            art.emit('playbackRateChange', rate);
         },
     });