summaryrefslogtreecommitdiff
path: root/src/web/app/common/scripts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-02-19 15:32:10 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-02-19 15:32:10 +0900
commitd392da64ab48a6c930d7f523dd9f844b0db2bd0b (patch)
tree653e15c8c9bf54a11070df6859dcdbf31d837e37 /src/web/app/common/scripts
parent:v: (diff)
downloadsharkey-d392da64ab48a6c930d7f523dd9f844b0db2bd0b.tar.gz
sharkey-d392da64ab48a6c930d7f523dd9f844b0db2bd0b.tar.bz2
sharkey-d392da64ab48a6c930d7f523dd9f844b0db2bd0b.zip
:tada:
Diffstat (limited to 'src/web/app/common/scripts')
-rw-r--r--src/web/app/common/scripts/api.js2
-rw-r--r--src/web/app/common/scripts/messaging-stream.js2
-rw-r--r--src/web/app/common/scripts/stream.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/web/app/common/scripts/api.js b/src/web/app/common/scripts/api.js
index 924d697ebc..b549fe47b9 100644
--- a/src/web/app/common/scripts/api.js
+++ b/src/web/app/common/scripts/api.js
@@ -24,7 +24,7 @@ module.exports = (i, endpoint, data = {}) => {
return new Promise((resolve, reject) => {
// Send request
- fetch(endpoint.indexOf('://') > -1 ? endpoint : `${CONFIG.api.url}/${endpoint}`, {
+ fetch(endpoint.indexOf('://') > -1 ? endpoint : `${CONFIG.apiUrl}/${endpoint}`, {
method: 'POST',
body: JSON.stringify(data),
credentials: endpoint === 'signin' ? 'include' : 'omit'
diff --git a/src/web/app/common/scripts/messaging-stream.js b/src/web/app/common/scripts/messaging-stream.js
index 17634c0707..2c00c24024 100644
--- a/src/web/app/common/scripts/messaging-stream.js
+++ b/src/web/app/common/scripts/messaging-stream.js
@@ -12,7 +12,7 @@ class Connection {
this.event = riot.observable();
this.me = me;
- const host = CONFIG.api.url.replace('http', 'ws');
+ const host = CONFIG.apiUrl.replace('http', 'ws');
this.socket = new ReconnectingWebSocket(`${host}/messaging?i=${me.token}&otherparty=${otherparty}`);
this.socket.addEventListener('open', this.onOpen);
this.socket.addEventListener('message', this.onMessage);
diff --git a/src/web/app/common/scripts/stream.js b/src/web/app/common/scripts/stream.js
index 5c8c3e1073..34ddc8447d 100644
--- a/src/web/app/common/scripts/stream.js
+++ b/src/web/app/common/scripts/stream.js
@@ -5,7 +5,7 @@ module.exports = me => {
let state = 'initializing';
const stateEv = riot.observable();
const event = riot.observable();
- const host = CONFIG.api.url.replace('http', 'ws');
+ const host = CONFIG.apiUrl.replace('http', 'ws');
const socket = new ReconnectingWebSocket(`${host}?i=${me.token}`);
socket.onopen = () => {