diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2017-06-07 00:04:28 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2017-06-07 00:04:28 +0900 |
| commit | 6dd635ddf3d0928bb0a283a21f342ff05e8e61ba (patch) | |
| tree | 02d294da5cb06611b7c01772f7418dc00161cbf8 /src/web/app/common | |
| parent | Merge branch 'master' of https://github.com/syuilo/misskey (diff) | |
| download | misskey-6dd635ddf3d0928bb0a283a21f342ff05e8e61ba.tar.gz misskey-6dd635ddf3d0928bb0a283a21f342ff05e8e61ba.tar.bz2 misskey-6dd635ddf3d0928bb0a283a21f342ff05e8e61ba.zip | |
Fix bug
Diffstat (limited to 'src/web/app/common')
| -rw-r--r-- | src/web/app/common/mixins/index.js | 4 | ||||
| -rw-r--r-- | src/web/app/common/mixins/stream.js | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/web/app/common/mixins/index.js b/src/web/app/common/mixins/index.js index 29cb6c9b6a..9718ee949b 100644 --- a/src/web/app/common/mixins/index.js +++ b/src/web/app/common/mixins/index.js @@ -2,8 +2,8 @@ import activateMe from './i'; import activateApi from './api'; import activateStream from './stream'; -export default me => { +export default (me, stream) => { activateMe(me); activateApi(me); - activateStream(me); + activateStream(stream); }; diff --git a/src/web/app/common/mixins/stream.js b/src/web/app/common/mixins/stream.js index e3b616a1a5..4706042b04 100644 --- a/src/web/app/common/mixins/stream.js +++ b/src/web/app/common/mixins/stream.js @@ -1,9 +1,5 @@ import * as riot from 'riot'; -import Connection from '../scripts/stream'; -export default me => { - const stream = me ? new Connection(me) : null; - riot.mixin('stream', { - stream: stream - }); +export default stream => { + riot.mixin('stream', { stream }); }; |