little cleanup

jeromeetienne · Oct 22, 2011 · 55b8b70 · 55b8b70
1 parent 475e66c
commit 55b8b70
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 220 deletions.
diff --git a/Makefile b/Makefile
@@ -24,8 +24,8 @@ docs:
 		> gapp/iframe/doc/index.html
 
 minify:
-	closurec --js node/server/node_modules/socket.io/support/socket.io-client/socket.io.js 		\
-			--js node/easyWebSocket-node.js 						\
+	closurec --js node/server/node_modules/socket.io-client/dist/socket.io.js	\
+			--js node/easyWebSocket-node.js 				\
 			--js_output_file easyWebSocket-node.min.js
 	closurec --js gapp/easyWebSocket-gapp.js --js_output_file easyWebSocket-gapp.min.js
 	cp easyWebSocket-node.min.js easyWebSocket.min.js

diff --git a/easyWebSocket-node.min.js b/easyWebSocket-node.min.js
diff --git a/easyWebSocket.min.js b/easyWebSocket.min.js
diff --git a/example/devel-node.html b/example/devel-node.html
@@ -4,7 +4,7 @@
 	<!-- json2 is included because some browsers doesnt have it (e.g. ie8)	-->
 	<script src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>
 
-	<script src="../node/server/node_modules/socket.io/support/socket.io-client/socket.io.js"></script>
+	<script src="../node/server/node_modules/socket.io-client/dist/socket.io.js"></script>
 	<script src="../node/easyWebSocket-node.js"></script>
 <!--	<script src="../easyWebSocket-node.min.js"></script>
 -->	

diff --git a/example/example.html b/example/example.html
@@ -5,7 +5,7 @@
 	<!-- json2 is included because some browsers doesnt have it (e.g. ie8)	-->
 	<script src="http://ajax.cdnjs.com/ajax/libs/json2/20110223/json2.js"></script>
 
-	<script src="http://easywebsocket.org/easyWebSocket.min.js"></script>  
+	<script src="../easyWebSocket.min.js"></script>  
 	<script>
 	    var socket = new EasyWebSocket("ws://example.com/resource");
 	    socket.onopen   = function(){

diff --git a/index.html b/index.html
@@ -140,7 +140,7 @@ <h1>
 		}
 	</style> 
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js"></script> 
-	<script src="https://github.com/jeromeetienne/EasyWebsocket/raw/master/easyWebSocket.min.js"></script> 
+	<script src="./easyWebSocket.min.js"></script> 
 	<script> 	 
 		jQuery(function() {
 			var socket = new EasyWebSocket("ws://cursors/moving/smooth")

diff --git a/node/easyWebSocket-node.js b/node/easyWebSocket-node.js
@@ -126,7 +126,9 @@ EasyWebSocket.CLOSED		= 3;
  *   * EasyWebSocket.logFunction	= console.log.bind(console);
 */
 
-EasyWebSocket.serverUrl    = "http://88.191.76.230:8950";   // TODO change this to be tunable and work on nodester
+EasyWebSocket.serverUrl	= "http://88.191.76.230:8950";	// TODO change this to be tunable and work on nodester
+//EasyWebSocket.serverUrl	= "http://192.168.0.10:8950";	// for devel only
+
 EasyWebSocket.logFunction	= function(){}
 
 //////////////////////////////////////////////////////////////////////////////////