mirror of
https://github.com/zhw2590582/ArtPlayer.git
synced 2026-10-24 23:51:20 -08:00
update property.js
This commit is contained in:
1 parent
a3b767f15d
commit
d34a6ba268
5 files changed
+14
-5
No files matched your search
@@ -33,6 +33,11 @@ export default class Artplayer extends Emitter {
|
||||
this.id = ++id;
|
||||
|
||||
const mergeOption = utils.mergeDeep(Artplayer.option, option);
|
||||
|
||||
if (option.container instanceof Element) {
|
||||
mergeOption.container = option.container;
|
||||
}
|
||||
|
||||
this.option = validator(mergeOption, scheme);
|
||||
|
||||
this.isLock = false;
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
addClass,
|
||||
setStyle,
|
||||
isMobile,
|
||||
mergeDeep,
|
||||
inverseClass,
|
||||
createElement,
|
||||
includeFromEvent,
|
||||
@@ -98,7 +99,8 @@ export default class Setting extends Component {
|
||||
this.remove();
|
||||
this.events = [];
|
||||
this.cache = new Map();
|
||||
const mergeSettings = [...this.defaultSettings, ...settings];
|
||||
const settingsCopy = settings.map((item) => mergeDeep({}, item));
|
||||
const mergeSettings = [...this.defaultSettings, ...settingsCopy];
|
||||
this.option = Setting.makeRecursion(mergeSettings);
|
||||
this.render(this.option);
|
||||
return this.option;
|
||||
|
||||
@@ -17,7 +17,7 @@ export function mergeDeep(...objects) {
|
||||
const oVal = obj[key];
|
||||
if (Array.isArray(pVal) && Array.isArray(oVal)) {
|
||||
prev[key] = pVal.concat(...oVal);
|
||||
} else if (isObject(pVal) && isObject(oVal) && !(oVal instanceof Element)) {
|
||||
} else if (isObject(pVal) && isObject(oVal)) {
|
||||
prev[key] = mergeDeep(pVal, oVal);
|
||||
} else {
|
||||
prev[key] = oVal;
|
||||
|
||||
Reference in new issue
Block a user