added window locations to clients

fredeerock · Apr 4, 2016 · aa12f2d · aa12f2d
1 parent 3217d9b
commit aa12f2d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/app/m/index.html b/app/m/index.html
@@ -39,8 +39,12 @@ <h1 onclick="causeSound.triggerCauseway();"><span class="mainTitle">Causeway</sp
 
 
 		<script>
+			// var socket = io.connect('http://emdm.io/', { path: '/sio/socket.io' });
+			// var socket = io.connect(window.location.origin, {path: '/sio/socket.io'});
+			var socket = io.connect(window.location.origin); 
+			console.log("window.location.origin:", window.location.origin);
+
 			// var socket = io.connect('http://emdm.io/sio');
-			var socket = io.connect('http://emdm.io/', { path: '/sio/socket.io' });
 			//var socket = io.connect('127.0.0.1:8001/');
 			var myColor = getRandomColor();
 			var myLocation = [0.5, 0.5];	// Default centered

diff --git a/app/m/theater.html b/app/m/theater.html
@@ -26,7 +26,12 @@ <h2>http://emdm.io/m</h2>
 <div id="causeway-text"></div>
 
 	<script>
-		var socket = io.connect('http://emdm.io/', { path: '/sio/socket.io' });
+		// var socket = io.connect('http://emdm.io/', { path: '/sio/socket.io' });
+		// var socket = io.connect(window.location.origin , {transports:['websocket']} );
+		// var socket = io.connect(window.location.origin, {path: '/sio/socket.io'}, {transports:['websocket']} );
+		var socket = io.connect(window.location.origin);
+		console.log("window.location.origin:", window.location.origin);
+
  		// var socket = io.connect('http://emdm.io/sio');
 		//var socket = io.connect('127.0.0.1:8001/');
  		socket.emit('addme', {name: "theater"});

diff --git a/installation.js b/installation.js
@@ -21,9 +21,9 @@ var app = express();
 app.use(express.static(__dirname + '/app/m')); // COMMENTED THIS OUT SO APP.JS SERVES CONTENT
 
 // FIXME: probably don't need this
-app.get('/', function (req, res) {
-	res.send('hello');
-});
+// app.get('/', function (req, res) {
+// 	res.send('hello');
+// });
 
 //	OSC Setup for sending (and receiving) OSC (to Max)
 var osc = require('node-osc');