summaryrefslogtreecommitdiff
path: root/src/client/app/common/scripts
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2018-09-01 23:30:16 +0900
committerAya Morisawa <AyaMorisawa4869@gmail.com>2018-09-01 23:30:16 +0900
commit5e0f5c31e72fc5e6af1a96b46052cfb57508d436 (patch)
tree6602df3af209166a9696effcfd8db9afe34fea5e /src/client/app/common/scripts
parentUse typeof (diff)
parentUse string interpolation (diff)
downloadmisskey-5e0f5c31e72fc5e6af1a96b46052cfb57508d436.tar.gz
misskey-5e0f5c31e72fc5e6af1a96b46052cfb57508d436.tar.bz2
misskey-5e0f5c31e72fc5e6af1a96b46052cfb57508d436.zip
Merge branch 'string-interpolation' into develop
Diffstat (limited to 'src/client/app/common/scripts')
-rw-r--r--src/client/app/common/scripts/streaming/stream.ts4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/app/common/scripts/streaming/stream.ts b/src/client/app/common/scripts/streaming/stream.ts
index fefa8e5ced..4ab78f1190 100644
--- a/src/client/app/common/scripts/streaming/stream.ts
+++ b/src/client/app/common/scripts/streaming/stream.ts
@@ -44,11 +44,11 @@ export default class Connection extends EventEmitter {
const query = params
? Object.keys(params)
- .map(k => encodeURIComponent(k) + '=' + encodeURIComponent(params[k]))
+ .map(k => `${encodeURIComponent(k)}=${encodeURIComponent(params[k])}`)
.join('&')
: null;
- this.socket = new ReconnectingWebsocket(`${wsUrl}/${endpoint}${query ? '?' + query : ''}`);
+ this.socket = new ReconnectingWebsocket(`${wsUrl}/${endpoint}${query ? `?${query}` : ''}`);
this.socket.addEventListener('open', this.onOpen);
this.socket.addEventListener('close', this.onClose);
this.socket.addEventListener('message', this.onMessage);