Clean up and fix reference error
This commit is contained in:
parent
f2326b846e
commit
04db2b2abb
1 changed files with 8 additions and 12 deletions
|
|
@ -56,7 +56,10 @@ export class Settings {
|
||||||
}
|
}
|
||||||
|
|
||||||
public getSettings(): SyncSettings {
|
public getSettings(): SyncSettings {
|
||||||
return this.settings;
|
return {
|
||||||
|
...this.settings,
|
||||||
|
ignorePatterns: [...this.settings.ignorePatterns]
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
public async setSetting<T extends keyof SyncSettings>(
|
public async setSetting<T extends keyof SyncSettings>(
|
||||||
|
|
@ -74,21 +77,14 @@ export class Settings {
|
||||||
`Updating settings with: ${JSON.stringify(value)}`
|
`Updating settings with: ${JSON.stringify(value)}`
|
||||||
);
|
);
|
||||||
const oldSettings = this.settings;
|
const oldSettings = this.settings;
|
||||||
this.settings = {
|
const next = { ...this.settings, ...value };
|
||||||
...this.settings,
|
await this.saveData(next);
|
||||||
...value
|
this.settings = next;
|
||||||
};
|
|
||||||
|
|
||||||
await this.onSettingsChanged.triggerAsync(
|
await this.onSettingsChanged.triggerAsync(
|
||||||
this.settings,
|
this.getSettings(),
|
||||||
oldSettings
|
oldSettings
|
||||||
);
|
);
|
||||||
|
|
||||||
await this.save();
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async save(): Promise<void> {
|
|
||||||
await this.saveData(this.settings);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue