Permalink
Browse files

Merge pull request #3 from healthety/new_libs

Refreshing lib versions and using correct way of socket.io minification
  • Loading branch information...
2 parents 170df58 + b11a5bf commit 5e55e145322eddbb6ea91dde39fe59a436876a63 @i0rek i0rek committed Nov 14, 2011
Showing with 42 additions and 52 deletions.
  1. +4 −1 lib/server.js
  2. +1 −1 public/index.html
  3. +4 −16 public/js/jquery.min.js
  4. +31 −30 public/js/jquery.ui.custom.min.js
  5. +2 −2 public/js/main.js
  6. +0 −2 public/js/socket.io.min.js
View
@@ -35,7 +35,10 @@ exports.run = function(httpPort, udpPort, options) {
.use(connect.static(__dirname + '/../public'));
var socket = io.listen(httpServer);
- socket.on('connection', function(client){
+ socket.enable('browser client minification');
+ socket.set('log level', 1); // reduce logging
+
+ socket.sockets.on('connection', function(client){
connected_clients.push(client)
});
View
@@ -7,7 +7,7 @@
<script src="js/jquery.ui.custom.min.js"></script>
<script src="js/jquery.getUrlParam.js"></script>
<script src="js/jquery.flot.min.js"></script>
- <script src="js/socket.io.min.js"></script>
+ <script src="/socket.io/socket.io.js"></script>
<script src="js/main.js"></script>
<script src="js/pimp.js"></script>
</head>
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 5e55e14

Please sign in to comment.