This commit is contained in:
Harvey Zack committed 2018-11-10 11:57:28 +08:00
1 parent c25038b74c
commit ae548e93c8
18 files changed
+176 -101

No files matched your search

@@ -3,6 +3,10 @@ import { setStyle, inverseClass } from '../utils';
export default function aspectRatioMix(art, player) {
const { refs: { $video, $player }, i18n, notice } = art;
Object.defineProperty(player, 'aspectRatioState', {
get: () => $player.dataset.aspectRatio
});
Object.defineProperty(player, 'aspectRatio', {
value: ratio => {
const ratioName = ratio.length === 2 ? `${ratio[0]}:${ratio[1]}` : i18n.get('Default');
@@ -37,11 +41,11 @@ export default function aspectRatioMix(art, player) {
Object.defineProperty(player, 'aspectRatioRemove', {
value: () => {
setStyle($video, 'width', null);
setStyle($video, 'height', null);
setStyle($video, 'padding', null);
delete $player.dataset.aspectRatio;
if (art.contextmenu.$aspectRatio) {
if (player.aspectRatioState) {
setStyle($video, 'width', null);
setStyle($video, 'height', null);
setStyle($video, 'padding', null);
delete $player.dataset.aspectRatio;
const $default = art.contextmenu.$aspectRatio.querySelector('.default');
inverseClass($default, 'current');
}
@@ -37,10 +37,10 @@ export default function fullscreenMix(art, player) {
value: () => {
if (player.fullscreenWebState) {
player.fullscreenWebExit();
$player.classList.remove('artplayer-fullscreen');
screenfull.exit();
art.emit('fullscreen:exit');
}
$player.classList.remove('artplayer-fullscreen');
screenfull.exit();
art.emit('fullscreen:exit');
}
});
@@ -19,9 +19,9 @@ export default function fullscreenWebMix(art, player) {
value: () => {
if (player.fullscreenState) {
player.fullscreenExit();
$player.classList.remove('artplayer-web-fullscreen');
art.emit('fullscreenWeb:exit');
}
$player.classList.remove('artplayer-web-fullscreen');
art.emit('fullscreenWeb:exit');
}
});
+11 -9
View File
@@ -50,15 +50,17 @@ export default function pipMix(art, player) {
Object.defineProperty(player, 'pipExit', {
value: () => {
$player.classList.remove('artplayer-pip');
cachePos = draggie.position;
setStyle($player, 'left', null);
setStyle($player, 'top', null);
player.fullscreenExit();
player.fullscreenWebExit();
player.aspectRatioRemove();
player.playbackRateRemove();
art.emit('pip', false);
if (player.pipState) {
$player.classList.remove('artplayer-pip');
cachePos = draggie.position;
setStyle($player, 'left', null);
setStyle($player, 'top', null);
player.fullscreenExit();
player.fullscreenWebExit();
player.aspectRatioRemove();
player.playbackRateRemove();
art.emit('pip', false);
}
}
});
@@ -3,6 +3,10 @@ import { clamp, inverseClass } from '../utils';
export default function playbackRateMix(art, player) {
const { refs: { $video, $player }, i18n, notice } = art;
Object.defineProperty(player, 'playbackRateState', {
get: () => $player.dataset.playbackRate
});
Object.defineProperty(player, 'playbackRate', {
value: rate => {
const newRate = clamp(rate, 0.1, 10);
@@ -15,9 +19,9 @@ export default function playbackRateMix(art, player) {
Object.defineProperty(player, 'playbackRateRemove', {
value: () => {
player.playbackRate(1);
delete $player.dataset.playbackRate;
if (art.contextmenu.$playbackRate) {
if (player.$playbackRateState) {
player.playbackRate(1);
delete $player.dataset.playbackRate;
const $normal = art.contextmenu.$playbackRate.querySelector('.normal');
inverseClass($normal, 'current');
}