x15904151985/ArtPlayer
1
0 Fork 0
mirror of https://github.com/zhw2590582/ArtPlayer.git synced 2026-10-27 01:21:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

update option-validator

Browse Source
This commit is contained in:
Harvey committed 2019-08-15 09:27:01 +08:00
1 parent cb2116fa9c
commit 09e1d66676
5 files changed
+65 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/artplayer/package.json
+1 -1
View File
@@ -25,7 +25,7 @@
"homepage": "https://github.com/zhw2590582/ArtPlayer#readme",
"dependencies": {
"balloon-css": "^1.0.0",
"option-validator": "^1.1.2",
"option-validator": "^1.1.3",
"screenfull": "^4.2.0"
}
}
packages/artplayer/src/index.js
+29 -34
View File
@@ -29,9 +29,35 @@ let id = 0;
class Artplayer extends Emitter {
constructor(option) {
super();
this.option = utils.mergeDeep(Artplayer.option, option);
validator(this.option, scheme);
this.init();
this.option = validator(utils.mergeDeep(Artplayer.option, option), scheme);
this.isFocus = false;
this.isDestroy = false;
this.whitelist = new Whitelist(this);
this.template = new Template(this);
this.events = new Events(this);
if (this.whitelist.state) {
this.storage = new Storage(this);
this.icons = new Icons(this);
this.i18n = new I18n(this);
this.notice = new Notice(this);
this.player = new Player(this);
this.layers = new Layers(this);
this.controls = new Controls(this);
this.contextmenu = new Contextmenu(this);
this.subtitle = new Subtitle(this);
this.info = new Info(this);
this.loading = new Loading(this);
this.hotkey = new Hotkey(this);
this.mask = new Mask(this);
this.setting = new Setting(this);
this.plugins = new Plugins(this);
} else {
this.mobile = new Mobile(this);
}
id += 1;
this.id = id;
Artplayer.instances.push(this);
// eslint-disable-next-line no-console
console.log(
'%c ArtPlayer %c __VERSION__ %c https://github.com/zhw2590582/ArtPlayer',
@@ -124,37 +150,6 @@ class Artplayer extends Emitter {
};
}
init() {
this.isFocus = false;
this.isDestroy = false;
this.whitelist = new Whitelist(this);
this.template = new Template(this);
this.events = new Events(this);
if (this.whitelist.state) {
this.storage = new Storage(this);
this.icons = new Icons(this);
this.i18n = new I18n(this);
this.notice = new Notice(this);
this.player = new Player(this);
this.layers = new Layers(this);
this.controls = new Controls(this);
this.contextmenu = new Contextmenu(this);
this.subtitle = new Subtitle(this);
this.info = new Info(this);
this.loading = new Loading(this);
this.hotkey = new Hotkey(this);
this.mask = new Mask(this);
this.setting = new Setting(this);
this.plugins = new Plugins(this);
} else {
this.mobile = new Mobile(this);
}
id += 1;
this.id = id;
Artplayer.instances.push(this);
}
destroy(removeHtml = false) {
this.events.destroy();
this.template.destroy(removeHtml);