dont bother with socketio on submodule, just use npm for server portion

vincentwoo · Apr 10, 2012 · aa11805 · aa11805
1 parent 506e930
commit aa11805
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "deps/headjs"]
 	path = deps/headjs
 	url = https://github.com/headjs/headjs.git
-[submodule "deps/socket.io"]
-	path = deps/socket.io
-	url = https://github.com/LearnBoost/socket.io.git
 [submodule "deps/socket.io-client"]
 	path = deps/socket.io-client
 	url = https://github.com/LearnBoost/socket.io-client.git
diff --git a/deps/socket.io b/deps/socket.io
diff --git a/server.js b/server.js
@@ -123,7 +123,7 @@ function buildStaticFiles() {
   ams.build
     .create(publicDir)
     .add(depsDir + '/JSON-js/json2.js')
-    .add(depsDir + '/Socket.IO/socket.io.js')
+    .add(depsDir + '/socket.io-client/dist/socket.io.js')
     .add(clientDir + '/util.js')
     .add(depsDir + '/jquery-bbq/jquery.ba-bbq.js')
     .add(depsDir + '/jquery.transform.js/jquery.transform.light.js')