diff --git a/src/core/configuration/ConfigurationManager.ts b/src/core/configuration/ConfigurationManager.ts index 5b6aef3f..00d51724 100644 --- a/src/core/configuration/ConfigurationManager.ts +++ b/src/core/configuration/ConfigurationManager.ts @@ -21,7 +21,7 @@ export class ConfigurationManager extends NitroManager implements IConfiguration protected onInit(): void { - this.parseConfiguration(this.getDefaultConfig()); + this.parseConfiguration(this.getDefaultConfig(), true); this._pendingUrls = this.getValue('config.urls').slice(); @@ -83,7 +83,7 @@ export class ConfigurationManager extends NitroManager implements IConfiguration this.events && this.events.dispatchEvent(new ConfigurationEvent(type)); } - private parseConfiguration(data: { [index: string]: any }): boolean + private parseConfiguration(data: { [index: string]: any }, overrides: boolean = false): boolean { if(!data) return false; @@ -93,13 +93,18 @@ export class ConfigurationManager extends NitroManager implements IConfiguration for(const key in data) { - if(this._definitions.has(key)) continue; - let value = data[key]; if(typeof value === 'string') value = this.interpolate((value as string), regex); - this.setValue(key, value); + if(this._definitions.has(key)) + { + if(overrides) this.setValue(key, value); + } + else + { + this.setValue(key, value); + } } return true; diff --git a/src/nitro/session/badge/BadgeImageManager.ts b/src/nitro/session/badge/BadgeImageManager.ts index 4d9b09c9..032f73d9 100644 --- a/src/nitro/session/badge/BadgeImageManager.ts +++ b/src/nitro/session/badge/BadgeImageManager.ts @@ -160,7 +160,6 @@ export class BadgeImageManager implements IDisposable url = (Nitro.instance.getConfiguration('badge.asset.url')).replace('%badgename%', badge); break; case BadgeImageManager.GROUP_BADGE: - //url = (Nitro.instance.getConfiguration('badge.asset.group.url')).replace('%badgedata%', badge); url = badge; break; }