summaryrefslogtreecommitdiff
path: root/src/web/app/common/scripts/streaming
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-03-06 08:35:25 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-03-06 08:35:25 +0900
commite515276e15fdf46a1756aa321701faf0b8d09854 (patch)
treee61267f45993f635aae7d9a58b4dce068f5022db /src/web/app/common/scripts/streaming
parent#1189 (diff)
downloadsharkey-e515276e15fdf46a1756aa321701faf0b8d09854.tar.gz
sharkey-e515276e15fdf46a1756aa321701faf0b8d09854.tar.bz2
sharkey-e515276e15fdf46a1756aa321701faf0b8d09854.zip
nanka iroiro
Closes #1188
Diffstat (limited to 'src/web/app/common/scripts/streaming')
-rw-r--r--src/web/app/common/scripts/streaming/home-stream.ts7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/web/app/common/scripts/streaming/home-stream.ts b/src/web/app/common/scripts/streaming/home-stream.ts
index 57bf0ec2a6..3516705e22 100644
--- a/src/web/app/common/scripts/streaming/home-stream.ts
+++ b/src/web/app/common/scripts/streaming/home-stream.ts
@@ -1,3 +1,5 @@
+import * as merge from 'object-assign-deep';
+
import Stream from './stream';
import MiOS from '../../mios';
@@ -18,7 +20,10 @@ export default class Connection extends Stream {
// 自分の情報が更新されたとき
this.on('i_updated', i => {
- Object.assign(me, i);
+ if (os.debug) {
+ console.log('I updated:', i);
+ }
+ merge(me, i);
});
// トークンが再生成されたとき