add indicatorGestureInit

docs/uncompiled/artplayer.js

@@ -2714,6 +2714,111 @@
     };
   }
 
+  function indicatorGestureInit(art, $indicator, setBar) {
+    if (isMobile && !art.option.isLive) {
+      var plugins = art.plugins,
+          $progress = art.template.$progress,
+          proxy = art.events.proxy;
+      var isDroging = false;
+      proxy($indicator, 'touchstart', function (event) {
+        if (event.touches.length === 1) {
+          isDroging = true;
+        }
+      });
+      proxy(document, 'touchmove', function (event) {
+        if (event.touches.length === 1 && isDroging) {
+          var autoOrientation = plugins.autoOrientation && plugins.autoOrientation.state;
+
+          var _$progress$getBoundin = $progress.getBoundingClientRect(),
+              left = _$progress$getBoundin.left,
+              top = _$progress$getBoundin.top;
+
+          var _event$touches$ = event.touches[0],
+              clientX = _event$touches$.clientX,
+              clientY = _event$touches$.clientY;
+          var width = clamp(clientX - left, 0, $progress.clientWidth);
+          var height = clamp(clientY - top, 0, $progress.clientWidth);
+          var size = autoOrientation ? height : width;
+          var secondX = width / $progress.clientWidth * art.duration;
+          var secondY = height / $progress.clientWidth * art.duration;
+          var second = autoOrientation ? secondY : secondX;
+          var percentage = clamp(size / $progress.clientWidth, 0, 1);
+          setBar('played', percentage);
+          art.seek = second;
+        }
+      });
+      proxy(document, 'touchend', function () {
+        if (isDroging) {
+          isDroging = false;
+        }
+      });
+    }
+  }
+  function gestureInit(art, events) {
+    if (isMobile && !art.option.isLive) {
+      var notice = art.notice,
+          plugins = art.plugins,
+          $video = art.template.$video;
+      var isDroging = false;
+      var startX = 0;
+      var startY = 0;
+      var currentTime = 0;
+      var pressTimer = null;
+      events.proxy($video, 'touchstart', function (event) {
+        if (event.touches.length === 1) {
+          isDroging = true;
+          var _event$touches$2 = event.touches[0],
+              clientX = _event$touches$2.clientX,
+              clientY = _event$touches$2.clientY;
+          startX = clientX;
+          startY = clientY;
+          clearTimeout(pressTimer);
+          pressTimer = setTimeout(function () {
+            art.playbackRate = 3;
+          }, 1000);
+        }
+      });
+      events.proxy($video, 'touchmove', function (event) {
+        if (event.touches.length === 1 && isDroging) {
+          var autoOrientation = plugins.autoOrientation && plugins.autoOrientation.state;
+          var _event$touches$3 = event.touches[0],
+              clientX = _event$touches$3.clientX,
+              clientY = _event$touches$3.clientY;
+          var ratioX = clamp((clientX - startX) / art.width, -1, 1);
+          var ratioY = clamp((clientY - startY) / art.height, -1, 1);
+
+          if (art.duration) {
+            if (autoOrientation) {
+              currentTime = clamp(art.currentTime + art.duration * ratioY, 0, art.duration);
+            } else {
+              currentTime = clamp(art.currentTime + art.duration * ratioX, 0, art.duration);
+            }
+
+            notice.show = "".concat(secondToTime(currentTime), " / ").concat(secondToTime(art.duration));
+          }
+        }
+      });
+      events.proxy(document, 'touchend', function () {
+        if (isDroging) {
+          if (currentTime) {
+            art.seek = currentTime;
+          }
+
+          if (art.playbackRate === 3) {
+            art.playbackRate = 1;
+          }
+
+          startX = 0;
+          startY = 0;
+          currentTime = 0;
+          isDroging = false;
+          clearTimeout(pressTimer);
+          pressTimer = null;
+        }
+      });
+    }
+  }
+
   function ownKeys$g(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
   function _objectSpread$g(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$g(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$g(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -2735,32 +2840,6 @@
       percentage: percentage
     };
   }
-  function getPosFromEventMobile(art, event) {
-    var autoOrientation = art.plugins.autoOrientation && art.plugins.autoOrientation.state;
-    var $progress = art.template.$progress;
-
-    var _$progress$getBoundin2 = $progress.getBoundingClientRect(),
-        left = _$progress$getBoundin2.left,
-        top = _$progress$getBoundin2.top;
-
-    var _event$touches$ = event.touches[0],
-        clientX = _event$touches$.clientX,
-        clientY = _event$touches$.clientY;
-    var width = clamp(clientX - left, 0, $progress.clientWidth);
-    var height = clamp(clientY - top, 0, $progress.clientWidth);
-    var size = autoOrientation ? height : width;
-    var secondX = width / $progress.clientWidth * art.duration;
-    var secondY = height / $progress.clientWidth * art.duration;
-    var second = autoOrientation ? secondY : secondX;
-    var time = secondToTime(second);
-    var percentage = clamp(size / $progress.clientWidth, 0, 1);
-    return {
-      second: second,
-      time: time,
-      size: size,
-      percentage: percentage
-    };
-  }
   function progress(options) {
     return function (art) {
       var icons = art.icons,
@@ -2898,26 +2977,7 @@
               isDroging = false;
             }
           });
-          proxy($indicator, 'touchstart', function (event) {
+          indicatorGestureInit(art, $indicator, setBar);
-            if (event.touches.length === 1) {
-              isDroging = true;
-            }
-          });
-          proxy(document, 'touchmove', function (event) {
-            if (event.touches.length === 1 && isDroging) {
-              var _getPosFromEventMobil = getPosFromEventMobile(art, event),
-                  second = _getPosFromEventMobil.second,
-                  percentage = _getPosFromEventMobil.percentage;
-
-              setBar('played', percentage);
-              art.seek = second;
-            }
-          });
-          proxy(document, 'touchend', function () {
-            if (isDroging) {
-              isDroging = false;
-            }
-          });
         }
       });
     };
@@ -3928,69 +3988,6 @@
     }
   }
 
-  function gestureInit(art, events) {
-    if (isMobile && !art.option.isLive) {
-      var notice = art.notice,
-          $video = art.template.$video;
-      var isDroging = false;
-      var startX = 0;
-      var startY = 0;
-      var currentTime = 0;
-      var pressTimer = null;
-      events.proxy($video, 'touchstart', function (event) {
-        if (event.touches.length === 1) {
-          isDroging = true;
-          var _event$touches$ = event.touches[0],
-              clientX = _event$touches$.clientX,
-              clientY = _event$touches$.clientY;
-          startX = clientX;
-          startY = clientY;
-          clearTimeout(pressTimer);
-          pressTimer = setTimeout(function () {
-            art.playbackRate = 3;
-          }, 1000);
-        }
-      });
-      events.proxy($video, 'touchmove', function (event) {
-        if (event.touches.length === 1 && isDroging) {
-          var _event$touches$2 = event.touches[0],
-              clientX = _event$touches$2.clientX,
-              clientY = _event$touches$2.clientY;
-          var ratioX = clamp((clientX - startX) / art.width, -1, 1);
-          var ratioY = clamp((clientY - startY) / art.height, -1, 1);
-
-          if (art.duration) {
-            if (art.plugins.autoOrientation && art.plugins.autoOrientation.state) {
-              currentTime = clamp(art.currentTime + art.duration * ratioY, 0, art.duration);
-            } else {
-              currentTime = clamp(art.currentTime + art.duration * ratioX, 0, art.duration);
-            }
-
-            notice.show = "".concat(secondToTime(currentTime), " / ").concat(secondToTime(art.duration));
-          }
-        }
-      });
-      events.proxy(document, 'touchend', function () {
-        if (isDroging) {
-          if (currentTime) {
-            art.seek = currentTime;
-          }
-
-          if (art.playbackRate === 3) {
-            art.playbackRate = 1;
-          }
-
-          startX = 0;
-          startY = 0;
-          currentTime = 0;
-          isDroging = false;
-          clearTimeout(pressTimer);
-          pressTimer = null;
-        }
-      });
-    }
-  }
-
   function viewInit(art, events) {
     var option = art.option,
         $container = art.template.$container;

docs/uncompiled/artplayer.js.map

@@ -1 +1 @@
-{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrMix.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.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/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/autoHeightMix.js","../../packages/artplayer/src/player/themeMix.js","../../packages/artplayer/src/player/titleMix.js","../../packages/artplayer/src/player/exclusiveMix.js","../../packages/artplayer/src/player/subtitleOffsetMix.js","../../packages/artplayer/src/player/optionInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/control/time.js","../../packages/artplayer/src/control/vLine truncated
+{"version":3,"file":"artplayer.js","sources":["../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/classCallCheck.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/createClass.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/assertThisInitialized.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/setPrototypeOf.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/inherits.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/typeof.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/possibleConstructorReturn.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/getPrototypeOf.js","../../node_modules/_style-inject@0.3.0@style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/_option-validator@2.0.6@option-validator/dist/option-validator.js","../../packages/artplayer/src/utils/emitter.js","../../packages/artplayer/src/utils/compatibility.js","../../packages/artplayer/src/utils/dom.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeFunction.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/isNativeReflectConstruct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/construct.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayLikeToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/arrayWithoutHoles.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/iterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/unsupportedIterableToArray.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/nonIterableSpread.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/defineProperty.js","../../packages/artplayer/src/scheme/index.js","../../packages/artplayer/src/config/index.js","../../packages/artplayer/src/whitelist.js","../../packages/artplayer/src/template.js","../../packages/artplayer/src/i18n/index.js","../../packages/artplayer/src/player/urlMix.js","../../packages/artplayer/src/player/attrMix.js","../../packages/artplayer/src/player/playMix.js","../../packages/artplayer/src/player/pauseMix.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/src/player/pipMix.js","../../packages/artplayer/src/player/loadedMix.js","../../packages/artplayer/src/player/playedMix.js","../../packages/artplayer/src/player/playingMix.js","../../packages/artplayer/src/player/autoSizeMix.js","../../packages/artplayer/src/player/rectMix.js","../../packages/artplayer/src/player/flipMix.js","../../packages/artplayer/src/player/miniMix.js","../../packages/artplayer/src/player/loopMix.js","../../packages/artplayer/src/player/posterMix.js","../../packages/artplayer/src/player/autoHeightMix.js","../../packages/artplayer/src/player/themeMix.js","../../packages/artplayer/src/player/titleMix.js","../../packages/artplayer/src/player/exclusiveMix.js","../../packages/artplayer/src/player/subtitleOffsetMix.js","../../packages/artplayer/src/player/optionInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/index.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/superPropBase.js","../../node_modules/_@babel_runtime@7.17.2@@babel/runtime/helpers/esm/get.js","../../packages/artplayer/src/utils/component.js","../../packages/artplayer/src/control/fullscreen.js","../../packages/artplayer/src/control/fullscreenWeb.js","../../packages/artplayer/src/control/pip.js","../../packages/artplayer/src/control/playAndPause.js","../../packages/artplayer/src/events/gestureInit.js","../../packages/artplayer/src/control/progress.js","../../packages/artplayer/src/control/subtitle.js","../../packages/artplayer/src/conLine truncated

packages/artplayer/src/control/progress.js

@@ -1,4 +1,5 @@
 import { query, clamp, append, setStyle, setStyles, secondToTime, includeFromEvent, isMobile } from '../utils';
+import { indicatorGestureInit } from '../events/gestureInit';
 
 export function getPosFromEvent(art, event) {
     const { $progress } = art.template;
@@ -11,27 +12,6 @@ export function getPosFromEvent(art, event) {
     return { second, time, width, percentage };
 }
 
-export function getPosFromEventMobile(art, event) {
-    const autoOrientation = art.plugins.autoOrientation && art.plugins.autoOrientation.state;
-
-    const { $progress } = art.template;
-    const { left, top } = $progress.getBoundingClientRect();
-    const { clientX, clientY } = event.touches[0];
-
-    const width = clamp(clientX - left, 0, $progress.clientWidth);
-    const height = clamp(clientY - top, 0, $progress.clientWidth);
-    const size = autoOrientation ? height : width;
-
-    const secondX = (width / $progress.clientWidth) * art.duration;
-    const secondY = (height / $progress.clientWidth) * art.duration;
-    const second = autoOrientation ? secondY : secondX;
-
-    const time = secondToTime(second);
-    const percentage = clamp(size / $progress.clientWidth, 0, 1);
-
-    return { second, time, size, percentage };
-}
-
 export default function progress(options) {
     return (art) => {
         const {
@@ -182,25 +162,7 @@ export default function progress(options) {
                     }
                 });
 
-                proxy($indicator, 'touchstart', (event) => {
+                indicatorGestureInit(art, $indicator, setBar);
-                    if (event.touches.length === 1) {
-                        isDroging = true;
-                    }
-                });
-
-                proxy(document, 'touchmove', (event) => {
-                    if (event.touches.length === 1 && isDroging) {
-                        const { second, percentage } = getPosFromEventMobile(art, event);
-                        setBar('played', percentage);
-                        art.seek = second;
-                    }
-                });
-
-                proxy(document, 'touchend', () => {
-                    if (isDroging) {
-                        isDroging = false;
-                    }
-                });
             },
         };
     };

packages/artplayer/src/events/gestureInit.js

@@ -1,9 +1,56 @@
 import { clamp, secondToTime, isMobile } from '../utils';
 
+export function indicatorGestureInit(art, $indicator, setBar) {
+    if (isMobile && !art.option.isLive) {
+        const {
+            plugins,
+            template: { $progress },
+            events: { proxy },
+        } = art;
+
+        let isDroging = false;
+
+        proxy($indicator, 'touchstart', (event) => {
+            if (event.touches.length === 1) {
+                isDroging = true;
+            }
+        });
+
+        proxy(document, 'touchmove', (event) => {
+            if (event.touches.length === 1 && isDroging) {
+                const autoOrientation = plugins.autoOrientation && plugins.autoOrientation.state;
+
+                const { left, top } = $progress.getBoundingClientRect();
+                const { clientX, clientY } = event.touches[0];
+
+                const width = clamp(clientX - left, 0, $progress.clientWidth);
+                const height = clamp(clientY - top, 0, $progress.clientWidth);
+                const size = autoOrientation ? height : width;
+
+                const secondX = (width / $progress.clientWidth) * art.duration;
+                const secondY = (height / $progress.clientWidth) * art.duration;
+
+                const second = autoOrientation ? secondY : secondX;
+                const percentage = clamp(size / $progress.clientWidth, 0, 1);
+
+                setBar('played', percentage);
+                art.seek = second;
+            }
+        });
+
+        proxy(document, 'touchend', () => {
+            if (isDroging) {
+                isDroging = false;
+            }
+        });
+    }
+}
+
 export default function gestureInit(art, events) {
     if (isMobile && !art.option.isLive) {
         const {
             notice,
+            plugins,
             template: { $video },
         } = art;
 
@@ -29,12 +76,14 @@ export default function gestureInit(art, events) {
 
         events.proxy($video, 'touchmove', (event) => {
             if (event.touches.length === 1 && isDroging) {
+                const autoOrientation = plugins.autoOrientation && plugins.autoOrientation.state;
+
                 const { clientX, clientY } = event.touches[0];
                 const ratioX = clamp((clientX - startX) / art.width, -1, 1);
                 const ratioY = clamp((clientY - startY) / art.height, -1, 1);
 
                 if (art.duration) {
-                    if (art.plugins.autoOrientation && art.plugins.autoOrientation.state) {
+                    if (autoOrientation) {
                         currentTime = clamp(art.currentTime + art.duration * ratioY, 0, art.duration);
                     } else {
                         currentTime = clamp(art.currentTime + art.duration * ratioX, 0, art.duration);