mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-28 02:01:20 -08:00
remove customPip
This commit is contained in:
Harvey committed
1 parent
634e776d49
commit
ed80218e44
3 files changed
+14
-147
No files matched your search
@@ -1959,74 +1959,6 @@
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function customPip(art, player) {
|
|
||||||
var option = art.option,
|
|
||||||
i18n = art.i18n,
|
|
||||||
_art$template = art.template,
|
|
||||||
$player = _art$template.$player,
|
|
||||||
$pipClose = _art$template.$pipClose,
|
|
||||||
$pipTitle = _art$template.$pipTitle,
|
|
||||||
$pipHeader = _art$template.$pipHeader,
|
|
||||||
proxy = art.events.proxy;
|
|
||||||
var cacheStyle = '';
|
|
||||||
var isDroging = false;
|
|
||||||
var lastPageX = 0;
|
|
||||||
var lastPageY = 0;
|
|
||||||
var lastPlayerLeft = 0;
|
|
||||||
var lastPlayerTop = 0;
|
|
||||||
proxy($pipHeader, 'mousedown', function (event) {
|
|
||||||
isDroging = true;
|
|
||||||
lastPageX = event.pageX;
|
|
||||||
lastPageY = event.pageY;
|
|
||||||
lastPlayerLeft = player.left;
|
|
||||||
lastPlayerTop = player.top;
|
|
||||||
});
|
|
||||||
proxy($pipHeader, 'mousemove', function (event) {
|
|
||||||
if (isDroging) {
|
|
||||||
addClass($player, 'art-is-dragging');
|
|
||||||
setStyle($player, 'left', "".concat(lastPlayerLeft + event.pageX - lastPageX, "px"));
|
|
||||||
setStyle($player, 'top', "".concat(lastPlayerTop + event.pageY - lastPageY, "px"));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
proxy(document, 'mouseup', function () {
|
|
||||||
isDroging = false;
|
|
||||||
removeClass($player, 'art-is-dragging');
|
|
||||||
});
|
|
||||||
proxy($pipClose, 'click', function () {
|
|
||||||
player.pip = false;
|
|
||||||
isDroging = false;
|
|
||||||
removeClass($player, 'art-is-dragging');
|
|
||||||
});
|
|
||||||
append($pipTitle, option.title || i18n.get('Mini player'));
|
|
||||||
def(player, 'pip', {
|
|
||||||
get: function get() {
|
|
||||||
return hasClass($player, 'art-pip');
|
|
||||||
},
|
|
||||||
set: function set(value) {
|
|
||||||
if (value) {
|
|
||||||
player.autoSize = false;
|
|
||||||
cacheStyle = $player.style.cssText;
|
|
||||||
addClass($player, 'art-pip');
|
|
||||||
var $body = document.body;
|
|
||||||
setStyle($player, 'top', "".concat($body.clientHeight - player.height - 50, "px"));
|
|
||||||
setStyle($player, 'left', "".concat($body.clientWidth - player.width - 50, "px"));
|
|
||||||
player.aspectRatio = false;
|
|
||||||
player.playbackRate = false;
|
|
||||||
art.emit('pipChange', true);
|
|
||||||
} else if (player.pip) {
|
|
||||||
$player.style.cssText = cacheStyle;
|
|
||||||
removeClass($player, 'art-pip');
|
|
||||||
setStyle($player, 'top', null);
|
|
||||||
setStyle($player, 'left', null);
|
|
||||||
player.aspectRatio = false;
|
|
||||||
player.playbackRate = false;
|
|
||||||
player.autoSize = true;
|
|
||||||
art.emit('pipChange', false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function pipMix(art, player) {
|
function pipMix(art, player) {
|
||||||
var $video = art.template.$video;
|
var $video = art.template.$video;
|
||||||
|
|
||||||
@@ -2035,7 +1967,11 @@
|
|||||||
} else if ($video.webkitSupportsPresentationMode) {
|
} else if ($video.webkitSupportsPresentationMode) {
|
||||||
webkitPip(art, player);
|
webkitPip(art, player);
|
||||||
} else {
|
} else {
|
||||||
customPip(art, player);
|
def(player, 'pip', {
|
||||||
|
get: function get() {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
def(player, 'pipToggle', {
|
def(player, 'pipToggle', {
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
{"version":3,"file":"artplayer.js","sources":["../../node_modules/@babel/runtime/helpers/classCallCheck.js","../../node_modules/@babel/runtime/helpers/createClass.js","../../node_modules/@babel/runtime/helpers/typeof.js","../../node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../node_modules/@babel/runtime/helpers/inherits.js","../../node_modules/style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/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/helpers/isNativeFunction.js","../../node_modules/@babel/runtime/helpers/construct.js","../../node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../node_modules/@babel/runtime/helpers/iterableToArray.js","../../node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../node_modules/@babel/runtime/helpers/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.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/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.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/fullscreenRotateMix.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/lightMix.js","../../packages/artplayer/src/player/index.js","../../node_modules/@babel/runtime/helpers/superPropBase.js","../../node_modules/@babel/runtime/helpers/get.js","../../packages/artplayer/src/utils/component.js","../../node_modules/@babel/runtime/helpers/defineProperty.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/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.js","../../packages/artplayer/src/control/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/light.js","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","../../packages/artplayer/src/events/clickInit.js","../../packages/artplayer/src/events/hoverInit.js","../../packages/artplayer/src/events/mousemoveInit.js","../../packages/artplayer/src/events/resizeInit.js","../../packages/artplayer/src/events/gestureInit.js","../../packages/artplayer/src/events/index.js","../../packages/artplayer/src/hotkey.js","../../packages/artplayer/src/layer.js","../../paLine truncated
|
{"version":3,"file":"artplayer.js","sources":["../../node_modules/@babel/runtime/helpers/classCallCheck.js","../../node_modules/@babel/runtime/helpers/createClass.js","../../node_modules/@babel/runtime/helpers/typeof.js","../../node_modules/@babel/runtime/helpers/assertThisInitialized.js","../../node_modules/@babel/runtime/helpers/possibleConstructorReturn.js","../../node_modules/@babel/runtime/helpers/getPrototypeOf.js","../../node_modules/@babel/runtime/helpers/setPrototypeOf.js","../../node_modules/@babel/runtime/helpers/inherits.js","../../node_modules/style-inject/dist/style-inject.es.js","../../packages/artplayer/node_modules/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/helpers/isNativeFunction.js","../../node_modules/@babel/runtime/helpers/construct.js","../../node_modules/@babel/runtime/helpers/wrapNativeSuper.js","../../packages/artplayer/src/utils/error.js","../../packages/artplayer/src/utils/subtitle.js","../../packages/artplayer/src/utils/file.js","../../node_modules/@babel/runtime/helpers/arrayWithoutHoles.js","../../node_modules/@babel/runtime/helpers/iterableToArray.js","../../node_modules/@babel/runtime/helpers/nonIterableSpread.js","../../node_modules/@babel/runtime/helpers/toConsumableArray.js","../../packages/artplayer/src/utils/property.js","../../packages/artplayer/src/utils/time.js","../../packages/artplayer/src/utils/format.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/attrInit.js","../../packages/artplayer/src/player/eventInit.js","../../packages/artplayer/src/player/exclusiveInit.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/fullscreenRotateMix.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/lightMix.js","../../packages/artplayer/src/player/index.js","../../node_modules/@babel/runtime/helpers/superPropBase.js","../../node_modules/@babel/runtime/helpers/get.js","../../packages/artplayer/src/utils/component.js","../../node_modules/@babel/runtime/helpers/defineProperty.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/volume.js","../../packages/artplayer/src/control/setting.js","../../packages/artplayer/src/control/thumbnails.js","../../packages/artplayer/src/control/screenshot.js","../../packages/artplayer/src/control/quality.js","../../packages/artplayer/src/control/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/light.js","../../packages/artplayer/src/contextmenu/close.js","../../packages/artplayer/src/contextmenu/index.js","../../packages/artplayer/src/info.js","../../packages/artplayer/src/subtitle.js","../../packages/artplayer/src/events/clickInit.js","../../packages/artplayer/src/events/hoverInit.js","../../packages/artplayer/src/events/mousemoveInit.js","../../packages/artplayer/src/events/resizeInit.js","../../packages/artplayer/src/events/gestureInit.js","../../packages/artplayer/src/events/index.js","../../packages/artplayer/src/hotkey.js","../../packages/artplayer/src/layer.js","../../paLine truncated
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
import { append, setStyle, addClass, removeClass, hasClass, def } from '../utils';
|
import { def } from '../utils';
|
||||||
|
|
||||||
function nativePip(art, player) {
|
function nativePip(art, player) {
|
||||||
const {
|
const {
|
||||||
@@ -15,12 +15,12 @@ function nativePip(art, player) {
|
|||||||
},
|
},
|
||||||
set(value) {
|
set(value) {
|
||||||
if (value) {
|
if (value) {
|
||||||
$video.requestPictureInPicture().catch(err => {
|
$video.requestPictureInPicture().catch((err) => {
|
||||||
notice.show = err;
|
notice.show = err;
|
||||||
throw err;
|
throw err;
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
document.exitPictureInPicture().catch(err => {
|
document.exitPictureInPicture().catch((err) => {
|
||||||
notice.show = err;
|
notice.show = err;
|
||||||
throw err;
|
throw err;
|
||||||
});
|
});
|
||||||
@@ -58,79 +58,6 @@ function webkitPip(art, player) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function customPip(art, player) {
|
|
||||||
const {
|
|
||||||
option,
|
|
||||||
i18n,
|
|
||||||
template: { $player, $pipClose, $pipTitle, $pipHeader },
|
|
||||||
events: { proxy },
|
|
||||||
} = art;
|
|
||||||
|
|
||||||
let cacheStyle = '';
|
|
||||||
let isDroging = false;
|
|
||||||
let lastPageX = 0;
|
|
||||||
let lastPageY = 0;
|
|
||||||
let lastPlayerLeft = 0;
|
|
||||||
let lastPlayerTop = 0;
|
|
||||||
|
|
||||||
proxy($pipHeader, 'mousedown', event => {
|
|
||||||
isDroging = true;
|
|
||||||
lastPageX = event.pageX;
|
|
||||||
lastPageY = event.pageY;
|
|
||||||
lastPlayerLeft = player.left;
|
|
||||||
lastPlayerTop = player.top;
|
|
||||||
});
|
|
||||||
|
|
||||||
proxy($pipHeader, 'mousemove', event => {
|
|
||||||
if (isDroging) {
|
|
||||||
addClass($player, 'art-is-dragging');
|
|
||||||
setStyle($player, 'left', `${lastPlayerLeft + event.pageX - lastPageX}px`);
|
|
||||||
setStyle($player, 'top', `${lastPlayerTop + event.pageY - lastPageY}px`);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
proxy(document, 'mouseup', () => {
|
|
||||||
isDroging = false;
|
|
||||||
removeClass($player, 'art-is-dragging');
|
|
||||||
});
|
|
||||||
|
|
||||||
proxy($pipClose, 'click', () => {
|
|
||||||
player.pip = false;
|
|
||||||
isDroging = false;
|
|
||||||
removeClass($player, 'art-is-dragging');
|
|
||||||
});
|
|
||||||
|
|
||||||
append($pipTitle, option.title || i18n.get('Mini player'));
|
|
||||||
|
|
||||||
def(player, 'pip', {
|
|
||||||
get() {
|
|
||||||
return hasClass($player, 'art-pip');
|
|
||||||
},
|
|
||||||
set(value) {
|
|
||||||
if (value) {
|
|
||||||
player.autoSize = false;
|
|
||||||
cacheStyle = $player.style.cssText;
|
|
||||||
addClass($player, 'art-pip');
|
|
||||||
const $body = document.body;
|
|
||||||
setStyle($player, 'top', `${$body.clientHeight - player.height - 50}px`);
|
|
||||||
setStyle($player, 'left', `${$body.clientWidth - player.width - 50}px`);
|
|
||||||
player.aspectRatio = false;
|
|
||||||
player.playbackRate = false;
|
|
||||||
art.emit('pipChange', true);
|
|
||||||
} else if (player.pip) {
|
|
||||||
$player.style.cssText = cacheStyle;
|
|
||||||
removeClass($player, 'art-pip');
|
|
||||||
setStyle($player, 'top', null);
|
|
||||||
setStyle($player, 'left', null);
|
|
||||||
player.aspectRatio = false;
|
|
||||||
player.playbackRate = false;
|
|
||||||
player.autoSize = true;
|
|
||||||
art.emit('pipChange', false);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
export default function pipMix(art, player) {
|
export default function pipMix(art, player) {
|
||||||
const { $video } = art.template;
|
const { $video } = art.template;
|
||||||
if (document.pictureInPictureEnabled) {
|
if (document.pictureInPictureEnabled) {
|
||||||
@@ -138,7 +65,11 @@ export default function pipMix(art, player) {
|
|||||||
} else if ($video.webkitSupportsPresentationMode) {
|
} else if ($video.webkitSupportsPresentationMode) {
|
||||||
webkitPip(art, player);
|
webkitPip(art, player);
|
||||||
} else {
|
} else {
|
||||||
customPip(art, player);
|
def(player, 'pip', {
|
||||||
|
get() {
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
def(player, 'pipToggle', {
|
def(player, 'pipToggle', {
|
||||||
|
|||||||
Reference in new issue
Block a user