misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source
This commit is contained in:
syuilo 2018-03-29 14:48:47 +09:00
parent 281b388e39
commit bfc193d8cd
308 changed files with 3045 additions and 3200 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/server/web/app/common/define-widget.ts
View file

@ -56,14 +56,14 @@ export default function<T extends object>(data: {
id: this.id,
data: newProps
}).then(() => {
(this as any).os.i.account.client_settings.mobile_home.find(w => w.id == this.id).data = newProps;
(this as any).os.i.account.clientSettings.mobile_home.find(w => w.id == this.id).data = newProps;
});
} else {
(this as any).api('i/update_home', {
id: this.id,
data: newProps
}).then(() => {
(this as any).os.i.account.client_settings.home.find(w => w.id == this.id).data = newProps;
(this as any).os.i.account.clientSettings.home.find(w => w.id == this.id).data = newProps;
});
}
}, {