diff --git a/packages/artplayer/src/control/progress.js b/packages/artplayer/src/control/progress.js index 6440bc97b..f59f147db 100644 --- a/packages/artplayer/src/control/progress.js +++ b/packages/artplayer/src/control/progress.js @@ -129,8 +129,7 @@ export default function progress(options) { proxy($control, 'click', (event) => { if (event.target !== $indicator) { - const autoOrientation = art.plugins.autoOrientation && art.plugins.autoOrientation.state; - if (autoOrientation) { + if (art.isRotate) { const { clientHeight } = document.documentElement; const percentage = event.pageY / clientHeight; const second = percentage * art.duration; diff --git a/packages/artplayer/src/events/gestureInit.js b/packages/artplayer/src/events/gestureInit.js index 97b55c11b..cfa30e6c1 100644 --- a/packages/artplayer/src/events/gestureInit.js +++ b/packages/artplayer/src/events/gestureInit.js @@ -21,11 +21,10 @@ export default function gestureInit(art, events) { const onTouchMove = (event) => { if (event.touches.length === 1 && isDroging && art.duration) { - const autoOrientation = art.plugins.autoOrientation && art.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); - const ratio = autoOrientation ? ratioY : ratioX; + const ratio = art.isRotate ? ratioY : ratioX; const currentTime = clamp( startTime + art.duration * ratio * art.constructor.TOUCH_MOVE_RATIO, 0, diff --git a/packages/artplayer/src/index.js b/packages/artplayer/src/index.js index 7d50d6d38..252994730 100644 --- a/packages/artplayer/src/index.js +++ b/packages/artplayer/src/index.js @@ -39,6 +39,7 @@ export default class Artplayer extends Emitter { this.isReady = false; this.isFocus = false; this.isInput = false; + this.isRotate = false; this.isDestroy = false; this.whitelist = new Whitelist(this); diff --git a/packages/artplayer/src/plugins/autoOrientation.js b/packages/artplayer/src/plugins/autoOrientation.js index 25ac7a999..6bb4b6d2c 100644 --- a/packages/artplayer/src/plugins/autoOrientation.js +++ b/packages/artplayer/src/plugins/autoOrientation.js @@ -22,6 +22,7 @@ export default function autoOrientation(art) { setStyle($player, 'transform-origin', '0 0'); setStyle($player, 'transform', `rotate(90deg) translate(0, -${viewWidth}px)`); addClass($player, 'art-auto-orientation'); + art.isRotate = true; art.emit('resize'); }, constructor.MOBILE_AUTO_ORIENTATION_TIME); } @@ -32,6 +33,7 @@ export default function autoOrientation(art) { setStyle($player, 'transform', null); setStyle($player, 'transform-origin', null); removeClass($player, 'art-auto-orientation'); + art.isRotate = false; art.aspectRatioReset = true; art.autoSize = option.autoSize; art.notice.show = '';