优化整体结构

This commit is contained in:
Harvey Zack committed 2019-04-30 13:06:24 +08:00
1 parent 9f9cb0e036
commit 487e865017
34 files changed
+505 -427

No files matched your search

@@ -1,5 +1,4 @@
import { append, tooltip, setStyle } from '../utils';
import icons from '../icons';
export default function fullscreen(controlOption) {
return art => ({
@@ -11,7 +10,7 @@ export default function fullscreen(controlOption) {
player,
} = art;
const $fullscreen = append($control, icons.fullscreen);
const $fullscreen = append($control, art.icons.fullscreen);
tooltip($fullscreen, i18n.get('Fullscreen'));
proxy($control, 'click', () => {
@@ -1,5 +1,4 @@
import { append, tooltip, setStyle } from '../utils';
import icons from '../icons';
export default function fullscreenWeb(controlOption) {
return art => ({
@@ -11,7 +10,7 @@ export default function fullscreenWeb(controlOption) {
player,
} = art;
const $fullscreenWeb = append($control, icons.fullscreenWeb);
const $fullscreenWeb = append($control, art.icons.fullscreenWeb);
tooltip($fullscreenWeb, i18n.get('Web fullscreen'));
proxy($control, 'click', () => {
+3 -3
View File
@@ -28,7 +28,7 @@ export default class Controls {
this.add(
progress({
name: 'progress',
disable: option.isLive,
disable: false,
position: 'top',
index: 10,
}),
@@ -37,7 +37,7 @@ export default class Controls {
this.add(
thumbnails({
name: 'thumbnails',
disable: !option.thumbnails.url || option.isLive,
disable: !option.thumbnails.url,
position: 'top',
index: 20,
}),
@@ -64,7 +64,7 @@ export default class Controls {
this.add(
time({
name: 'time',
disable: option.isLive,
disable: false,
position: 'left',
index: 30,
}),
+1 -2
View File
@@ -1,5 +1,4 @@
import { append, tooltip } from '../utils';
import icons from '../icons';
export default function pip(controlOption) {
return art => ({
@@ -10,7 +9,7 @@ export default function pip(controlOption) {
i18n,
player,
} = art;
const $pip = append($control, icons.pip);
const $pip = append($control, art.icons.pip);
tooltip($pip, i18n.get('Mini player'));
proxy($control, 'click', () => {
player.pipEnabled();
@@ -1,5 +1,4 @@
import { append, tooltip, setStyle } from '../utils';
import icons from '../icons';
export default function playAndPause(controlOption) {
return art => ({
@@ -11,8 +10,8 @@ export default function playAndPause(controlOption) {
i18n,
} = art;
const $play = append($control, icons.play);
const $pause = append($control, icons.pause);
const $play = append($control, art.icons.play);
const $pause = append($control, art.icons.pause);
tooltip($play, i18n.get('Play'));
tooltip($pause, i18n.get('Pause'));
@@ -1,5 +1,4 @@
import { append, tooltip } from '../utils';
import icons from '../icons';
export default function screenshot(controlOption) {
return art => ({
@@ -11,7 +10,7 @@ export default function screenshot(controlOption) {
player,
} = art;
const $screenshot = append($control, icons.screenshot);
const $screenshot = append($control, art.icons.screenshot);
tooltip($screenshot, i18n.get('Screenshot'));
proxy($screenshot, 'click', () => {
player.screenshot();
+1 -2
View File
@@ -1,5 +1,4 @@
import { append, tooltip, setStyle } from '../utils';
import icons from '../icons';
export default function setting(controlOption) {
return art => ({
@@ -11,7 +10,7 @@ export default function setting(controlOption) {
setting,
} = art;
const $setting = append($control, icons.setting);
const $setting = append($control, art.icons.setting);
tooltip($setting, i18n.get('Show setting'));
proxy($control, 'click', () => {
+1 -2
View File
@@ -1,5 +1,4 @@
import { append, tooltip, setStyle } from '../utils';
import icons from '../icons';
export default function subtitle(controlOption) {
return art => ({
@@ -11,7 +10,7 @@ export default function subtitle(controlOption) {
subtitle,
} = art;
const $subtitle = append($control, icons.subtitle);
const $subtitle = append($control, art.icons.subtitle);
tooltip($subtitle, i18n.get('Hide subtitle'));
proxy($control, 'click', () => {
+2 -3
View File
@@ -1,5 +1,4 @@
import { append, clamp, tooltip, setStyle, getStyle } from '../utils';
import icons from '../icons';
export default function volume(controlOption) {
return art => ({
@@ -12,8 +11,8 @@ export default function volume(controlOption) {
} = art;
let isDroging = false;
const $volume = append($control, icons.volume);
const $volumeClose = append($control, icons.volumeClose);
const $volume = append($control, art.icons.volume);
const $volumeClose = append($control, art.icons.volumeClose);
const $volumePanel = append($control, '<div class="art-volume-panel"></div>');
const $volumeHandle = append($volumePanel, '<div class="art-volume-slider-handle"></div>');
tooltip($volume, i18n.get('Mute'));