mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-29 11:11:20 -08:00
bugfix
This commit is contained in:
1 parent
4fbb3442e0
commit
650d1abef3
6 files changed
+26
-4
No files matched your search
+1
-1
@@ -21,7 +21,7 @@
|
|||||||
<div class="part-left">
|
<div class="part-left">
|
||||||
<div class="controls">
|
<div class="controls">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<a href="https://github.com/zhw2590582/ArtPlayer" class="logo" target="_blank">ArtPlayer.js</a>
|
<a href="https://github.com/zhw2590582/ArtPlayer" class="logo" target="_blank">ArtPlayer.js Lab</a>
|
||||||
<iframe src="https://ghbtns.com/github-btn.html?user=zhw2590582&repo=ArtPlayer&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
|
<iframe src="https://ghbtns.com/github-btn.html?user=zhw2590582&repo=ArtPlayer&type=star&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
|
||||||
<iframe src="https://ghbtns.com/github-btn.html?user=zhw2590582&repo=ArtPlayer&type=fork&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
|
<iframe src="https://ghbtns.com/github-btn.html?user=zhw2590582&repo=ArtPlayer&type=fork&count=true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
+10
-1
@@ -2841,6 +2841,10 @@
|
|||||||
});
|
});
|
||||||
Object.defineProperty(player, 'pipEnabled', {
|
Object.defineProperty(player, 'pipEnabled', {
|
||||||
value: function value() {
|
value: function value() {
|
||||||
|
if (player.autoSizeState) {
|
||||||
|
player.autoSizeRemove();
|
||||||
|
}
|
||||||
|
|
||||||
if (!draggie) {
|
if (!draggie) {
|
||||||
draggie = new draggabilly($player, {
|
draggie = new draggabilly($player, {
|
||||||
handle: '.artplayer-pip-header'
|
handle: '.artplayer-pip-header'
|
||||||
@@ -2910,6 +2914,11 @@
|
|||||||
$container = _art$refs.$container,
|
$container = _art$refs.$container,
|
||||||
$player = _art$refs.$player,
|
$player = _art$refs.$player,
|
||||||
$video = _art$refs.$video;
|
$video = _art$refs.$video;
|
||||||
|
Object.defineProperty(player, 'autoSizeState', {
|
||||||
|
get: function get() {
|
||||||
|
return $container.classList.contains('artplayer-auto-size');
|
||||||
|
}
|
||||||
|
});
|
||||||
Object.defineProperty(player, 'autoSize', {
|
Object.defineProperty(player, 'autoSize', {
|
||||||
value: function value() {
|
value: function value() {
|
||||||
var videoWidth = $video.videoWidth,
|
var videoWidth = $video.videoWidth,
|
||||||
@@ -4680,7 +4689,7 @@
|
|||||||
var resizeObserver = new ResizeObserver_2(function () {
|
var resizeObserver = new ResizeObserver_2(function () {
|
||||||
sleep().then(function () {
|
sleep().then(function () {
|
||||||
if (option.autoSize) {
|
if (option.autoSize) {
|
||||||
if (!art.player.fullscreenState && !art.player.fullscreenWebState) {
|
if (!art.player.fullscreenState && !art.player.fullscreenWebState && !art.player.pipState) {
|
||||||
art.player.autoSize();
|
art.player.autoSize();
|
||||||
} else {
|
} else {
|
||||||
art.player.autoSizeRemove();
|
art.player.autoSizeRemove();
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"artplayer.js","sources":["../../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/@babel/runtime/helpers/defineProperty.js","../../packages/artplayer/node_modules/@babel/runtime/helpers/objectSpread.js","../../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/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/node_modules/option-validator/dist/option-validator.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/node_modules/tiny-emitter/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/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","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","Line truncated
|
{"version":3,"file":"artplayer.js","sources":["../../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/@babel/runtime/helpers/defineProperty.js","../../packages/artplayer/node_modules/@babel/runtime/helpers/objectSpread.js","../../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/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/node_modules/option-validator/dist/option-validator.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/node_modules/tiny-emitter/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/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","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","Line truncated
|
||||||
@@ -6,7 +6,11 @@ export default function resizeInit(art, events) {
|
|||||||
const resizeObserver = new ResizeObserver(() => {
|
const resizeObserver = new ResizeObserver(() => {
|
||||||
sleep().then(() => {
|
sleep().then(() => {
|
||||||
if (option.autoSize) {
|
if (option.autoSize) {
|
||||||
if (!art.player.fullscreenState && !art.player.fullscreenWebState) {
|
if (
|
||||||
|
!art.player.fullscreenState &&
|
||||||
|
!art.player.fullscreenWebState &&
|
||||||
|
!art.player.pipState
|
||||||
|
) {
|
||||||
art.player.autoSize();
|
art.player.autoSize();
|
||||||
} else {
|
} else {
|
||||||
art.player.autoSizeRemove();
|
art.player.autoSizeRemove();
|
||||||
|
|||||||
@@ -3,6 +3,10 @@ import { setStyle } from '../utils';
|
|||||||
export default function resizeMix(art, player) {
|
export default function resizeMix(art, player) {
|
||||||
const { refs: { $container, $player, $video } } = art;
|
const { refs: { $container, $player, $video } } = art;
|
||||||
|
|
||||||
|
Object.defineProperty(player, 'autoSizeState', {
|
||||||
|
get: () => $container.classList.contains('artplayer-auto-size')
|
||||||
|
});
|
||||||
|
|
||||||
Object.defineProperty(player, 'autoSize', {
|
Object.defineProperty(player, 'autoSize', {
|
||||||
value: () => {
|
value: () => {
|
||||||
const { videoWidth, videoHeight } = $video;
|
const { videoWidth, videoHeight } = $video;
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ export default function pipMix(art, player) {
|
|||||||
|
|
||||||
Object.defineProperty(player, 'pipEnabled', {
|
Object.defineProperty(player, 'pipEnabled', {
|
||||||
value: () => {
|
value: () => {
|
||||||
|
if (player.autoSizeState) {
|
||||||
|
player.autoSizeRemove();
|
||||||
|
}
|
||||||
|
|
||||||
if (!draggie) {
|
if (!draggie) {
|
||||||
draggie = new Draggabilly($player, {
|
draggie = new Draggabilly($player, {
|
||||||
handle: '.artplayer-pip-header'
|
handle: '.artplayer-pip-header'
|
||||||
@@ -34,6 +38,7 @@ export default function pipMix(art, player) {
|
|||||||
setStyle($player, 'left', `${cachePos.x}px`);
|
setStyle($player, 'left', `${cachePos.x}px`);
|
||||||
setStyle($player, 'top', `${cachePos.y}px`);
|
setStyle($player, 'top', `${cachePos.y}px`);
|
||||||
}
|
}
|
||||||
|
|
||||||
$player.classList.add('artplayer-pip');
|
$player.classList.add('artplayer-pip');
|
||||||
player.fullscreenExit();
|
player.fullscreenExit();
|
||||||
player.fullscreenWebExit();
|
player.fullscreenWebExit();
|
||||||
|
|||||||
Reference in new issue
Block a user