summaryrefslogtreecommitdiff
path: root/src/server/web/app/common/define-widget.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-29 14:48:47 +0900
commitbfc193d8cd9aecdb82d585e8b4e101deac60a5bb (patch)
tree8b4dac3a56cf703650c8207f9279028a8560a96b /src/server/web/app/common/define-widget.ts
parentresolve conflict (diff)
downloadsharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.gz
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.tar.bz2
sharkey-bfc193d8cd9aecdb82d585e8b4e101deac60a5bb.zip
Resolve conflicts
Diffstat (limited to 'src/server/web/app/common/define-widget.ts')
-rw-r--r--src/server/web/app/common/define-widget.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/web/app/common/define-widget.ts b/src/server/web/app/common/define-widget.ts
index d8d29873a4..27db59b5ee 100644
--- a/src/server/web/app/common/define-widget.ts
+++ b/src/server/web/app/common/define-widget.ts
@@ -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;
});
}
}, {