ff-stream-web

commit 708e48dc70d58da6d9cf550f6758f9a2adfb2682
parent 41dbb09942ff475aac05c7f411be09b06659bdc7
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Thu,  6 Aug 2015 23:37:14 +0300

Merge branch 'Mobiletainment-master'; update src/core/http

Diffstat:
M
src/core/http.js
 | 
12
+++++-------

1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/core/http.js b/src/core/http.js
@@ -3,19 +3,17 @@
 import request from 'superagent';
 import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 
-const getBaseUrl = (() => {
-  let baseUrl;
-  return () => baseUrl || (baseUrl = ExecutionEnvironment.canUseDOM ? '' :
+const getUrl = path => path.startsWith('http') ?
+  path : ExecutionEnvironment.canUseDOM ? path :
     process.env.WEBSITE_HOSTNAME ?
-      `http://${process.env.WEBSITE_HOSTNAME}` :
-      `http://127.0.0.1:${global.server.get('port')}`);
-})();
+      `http://${process.env.WEBSITE_HOSTNAME}${path}` :
+      `http://127.0.0.1:${global.server.get('port')}${path}`;
 
 const http = {
 
   get: path => new Promise((resolve, reject) => {
     request
-      .get(getBaseUrl() + path)
+      .get(getUrl(path))
       .accept('application/json')
       .end((err, res) => {
         if (err) {