Merge pull request #12 from danielkutik/master

Connect WebSocket relative to window.location

Author: sarenji

example/index.html

@@ -197,8 +197,7 @@
 
         var room = window.location.hash.slice(1);
 
-        //When using localhost
-        rtc.connect("ws://localhost:8000/", room);
+        rtc.connect("ws:" + window.location.href.substring(window.location.protocol.length), room);
 
         rtc.on('add remote stream', function(stream, socketId) {
           console.log("ADDING REMOTE STREAM...");

example/server.js

@@ -1,6 +1,8 @@
-var app = require('express').createServer();
-app.listen(8000);
-var webRTC = require('webrtc.io').listen(app);
+var app = require('express')();
+var server = require('http').createServer(app);
+var webRTC = require('webrtc.io').listen(server);
+
+server.listen(8000);
 
 
 
@@ -53,4 +55,4 @@ webRTC.rtc.on('chat_msg', function(data, socket) {
       }
     }
   }
-});
+});

package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "webrtc.io": "latest",
     "webrtc.io-client": "latest",
-    "express": "2.5.1",
+    "express": "3.1.0",
     "ws": "latest"
   },
   "subdomain": "MultiWebRTC",