This commit is contained in:
Harvey Zack committed 2018-11-12 10:00:55 +08:00
1 parent eed28c1d21
commit 7f1e1dc255
10 files changed
+44 -89

No files matched your search

@@ -0,0 +1,7 @@
export default function doubleClickInit(art, events) {
const { refs: { $player } } = art;
events.proxy($player, 'dblclick', () => {
art.player.fullscreenToggle();
art.emit('dblclick');
});
}
+2
View File
@@ -2,6 +2,7 @@ import clickInit from './clickInit';
import hoverInit from './hoverInit';
import mousemoveInit from './mousemoveInit';
import resizeInit from './resizeInit';
import doubleClickInit from './doubleClickInit';
export default class Events {
constructor(art) {
@@ -12,6 +13,7 @@ export default class Events {
hoverInit(art, this);
mousemoveInit(art, this);
resizeInit(art, this);
doubleClickInit(art, this);
}
proxy(target, name, callback, option = {}) {
-14
View File
@@ -89,20 +89,6 @@ class Artplayer extends Emitter {
'webkit-playsinline': true,
'playsinline': true
},
replace: {
loading: '',
playBig: '',
play: '',
pause: '',
volume: '',
volumeClose: '',
subtitle: '',
screenshot: '',
setting: '',
fullscreen: '',
fullscreenWeb: '',
pip: ''
},
lang: navigator.language.toLowerCase()
};
}
@@ -35,7 +35,7 @@ export default function fullscreenMix(art, player) {
Object.defineProperty(player, 'fullscreenExit', {
value: () => {
if (player.fullscreenWebState) {
if (player.fullscreenState) {
player.fullscreenWebExit();
$player.classList.remove('artplayer-fullscreen');
screenfull.exit();
@@ -17,7 +17,7 @@ export default function fullscreenWebMix(art, player) {
Object.defineProperty(player, 'fullscreenWebExit', {
value: () => {
if (player.fullscreenState) {
if (player.fullscreenWebState) {
player.fullscreenExit();
$player.classList.remove('artplayer-web-fullscreen');
art.emit('fullscreenWeb:exit');
-5
View File
@@ -1,6 +1,5 @@
import validElement from './validElement';
import validStringEmpty from './validStringEmpty';
import validElementMap from './validElementMap';
export default {
container: {
@@ -64,10 +63,6 @@ export default {
url: 'string'
}
},
replace: {
type: 'object',
validator: validElementMap
},
theme: 'string',
hotkey: 'boolean',
pip: 'boolean',
@@ -1,12 +0,0 @@
import { ArtPlayerError } from '../utils';
export default function validElementMap(paths, value) {
return Object.keys(value).every(key => {
const mapValue = value[key];
const mapType = typeof mapValue;
if (mapValue instanceof Element || mapType === 'string') {
return true;
}
throw new ArtPlayerError(`${paths.join('.')} require 'string' or 'Element' type, but got '${mapType}'`);
});
}