Mizah/Sharkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

バグ修正など

Browse source
This commit is contained in:
syuilo 2018-04-29 17:54:50 +09:00
parent 665afccb45
commit a8083eb52b
6 changed files with 21 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client/app/common/mios.ts
View file

@ -332,7 +332,7 @@ export default class MiOS extends EventEmitter {
const cachedSettings = JSON.parse(localStorage.getItem('settings'));
if (cachedSettings) {
this.store.commit('settings/init', cachedSettings);
this.store.dispatch('settings/merge', cachedSettings);
}
//#endregion
@ -350,7 +350,7 @@ export default class MiOS extends EventEmitter {
fetchme(cachedMe.token, freshData => {
merge(cachedMe, freshData);
this.store.commit('settings/init', freshData.clientSettings);
this.store.dispatch('settings/merge', freshData.clientSettings);
});
} else {
// Get token from cookie
@ -358,9 +358,7 @@ export default class MiOS extends EventEmitter {
fetchme(i, me => {
if (me) {
Object.entries(me.clientSettings).forEach(([key, value]) => {
this.store.commit('settings/set', { key, value });
});
this.store.dispatch('settings/merge', me.clientSettings);
fetched(me);
} else {