This commit is contained in:
Harvey Zack committed 2018-11-13 18:55:48 +08:00
1 parent 49fe680c87
commit cd001655e4
8 files changed
+63 -53

No files matched your search

+12 -12
View File
@@ -16,7 +16,7 @@ export default class Contextmenu {
}
init() {
const { option, refs, events: { proxy } } = this.art;
const { option, refs: { $player, $contextmenu }, events: { proxy } } = this.art;
option.contextmenu.push(
playbackRate,
@@ -30,14 +30,14 @@ export default class Contextmenu {
this.add(item);
});
proxy(refs.$player, 'contextmenu', event => {
proxy($player, 'contextmenu', event => {
event.preventDefault();
this.show();
this.setPos(event);
});
proxy(refs.$player, 'click', event => {
if (refs.$contextmenu && !event.composedPath().includes(refs.$contextmenu)) {
proxy($player, 'click', event => {
if (!event.composedPath().includes($contextmenu)) {
this.hide();
}
});
@@ -45,12 +45,12 @@ export default class Contextmenu {
add(item, callback) {
if (!item.disable) {
const { refs, events: { proxy } } = this.art;
id++;
const { refs: { $contextmenu }, events: { proxy } } = this.art;
const name = item.name || `contextmenu${id}`;
const menu = typeof item === 'function' ? item(this.art) : item;
const $menu = document.createElement('div');
$menu.setAttribute('class', `art-contextmenu art-contextmenu-${name || id}`);
$menu.classList.value = `art-contextmenu art-contextmenu-${name}`;
append($menu, menu.html);
setStyles($menu, menu.style || {});
if (menu.click) {
@@ -62,16 +62,16 @@ export default class Contextmenu {
}
callback && callback($menu);
this[name] = $menu;
insertByIndex(refs.$contextmenu, $menu, menu.index || id);
insertByIndex($contextmenu, $menu, menu.index || id);
}
}
setPos(event) {
const { refs } = this.art;
const { refs: { $player, $contextmenu } } = this.art;
const mouseX = event.clientX;
const mouseY = event.clientY;
const { height: cHeight, width: cWidth, left: cLeft, top: cTop } = refs.$player.getBoundingClientRect();
const { height: mHeight, width: mWidth } = refs.$contextmenu.getBoundingClientRect();
const { height: cHeight, width: cWidth, left: cLeft, top: cTop } = $player.getBoundingClientRect();
const { height: mHeight, width: mWidth } = $contextmenu.getBoundingClientRect();
let menuLeft = mouseX - cLeft;
let menuTop = mouseY - cTop;
@@ -83,8 +83,8 @@ export default class Contextmenu {
menuTop = cHeight - mHeight;
}
setStyle(refs.$contextmenu, 'left', `${menuLeft}px`);
setStyle(refs.$contextmenu, 'top', `${menuTop}px`);
setStyle($contextmenu, 'left', `${menuLeft}px`);
setStyle($contextmenu, 'top', `${menuTop}px`);
}
hide() {
+1 -1
View File
@@ -118,7 +118,7 @@ export default class Controls {
id++;
const name = option.name || `control${id}`;
const $control = document.createElement('div');
$control.setAttribute('class', `art-control art-control-${name}`);
$control.classList.value = `art-control art-control-${name}`;
this.mount(option.position, $control, option.index || id);
control.apply && control.apply(this.art, $control);
callback && callback($control);
+1 -1
View File
@@ -32,7 +32,7 @@ export default class Progress {
this.$tip = $control.querySelector('.art-progress-tip');
highlight.forEach(item => {
const left = Number(item.time) / player.duration;
const left = Number(item.time || 0) / player.duration;
append(this.$highlight, `<span data-text="${item.text || ''}" data-time="${item.time || 0}" style="left: ${left * 100}%"></span>`);
});
+3 -3
View File
@@ -57,15 +57,15 @@ class Artplayer extends Emitter {
playbackRate: false,
aspectRatio: false,
screenshot: false,
type: '',
mimeCodec: '',
theme: '#f00',
setting: false,
hotkey: true,
pip: false,
mutex: true,
fullscreen: false,
fullscreenWeb: false,
type: '',
mimeCodec: '',
theme: '#f00',
layers: [],
contextmenu: [],
quality: [],