Merge pull request rauchg#61 from Graham42/bug/relative_paths

Allow hosting at a subfolder
Hacker0x01 · Sep 21, 2015 · 0b7da63 · 0b7da63
2 parents 91ef979 + c16013a
commit 0b7da63
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/lib/assets/client.js b/lib/assets/client.js
@@ -48,8 +48,11 @@ function invite(channel, email, fn){
   });
 }
 
+// use dom element for better cross browser compatibility
+var url = document.createElement('a');
+url.href = window.location;
 // realtime updates
-var socket = io();
+var socket = io({path: (url.pathname + '/socket.io').replace('//','/')});
 socket.on('data', function(users){
   for (var i in users) update(i, users[i]);
 });

diff --git a/lib/assets/iframe.js b/lib/assets/iframe.js
@@ -52,7 +52,11 @@
   var script = document.createElement('script');
   script.src = 'https://cdn.socket.io/socket.io-1.3.2.js';
   script.onload = function(){
-    var socket = io();
+
+    // use dom element for better cross browser compatibility
+    var url = document.createElement('a');
+    url.href = window.location;
+    var socket = io({path: (url.pathname + '/socket.io').replace('//','/')});
     var count = document.getElementsByClassName('slack-count')[0];
 
     socket.on('data', function(users){

diff --git a/lib/splash.js b/lib/splash.js
@@ -44,8 +44,8 @@ export default function splash({ name, org, logo, active, total, channels, ifram
     style({ logo, active, iframe }),
     // xxx: single build
     dom('script src=https://cdn.socket.io/socket.io-1.3.2.js'),
-    dom('script src=/assets/superagent.js'),
-    dom('script src=/assets/client.js')
+    dom('script src=assets/superagent.js'),
+    dom('script src=assets/client.js')
   );
   return div;
 }
@@ -102,7 +102,7 @@ function style({ logo, active, iframe } = {}){
     });
 
     css.add('.logo.slack', {
-      'background-image': 'url(/assets/slack.svg)'
+      'background-image': 'url(assets/slack.svg)'
     });
 
     if (logo) {