Permalink
Browse files

Fixed issue with client connect. Reverted to old require-jquery.js

  • Loading branch information...
1 parent 0d3597b commit 93f8d37337d2fb7eae5ac8d71ab18cc92dc5bb3a @a727891 committed Feb 4, 2013
Showing with 6,274 additions and 6,708 deletions.
  1. +6 −4 Client/js/app.js
  2. +6,265 −6,701 Client/js/lib/require-jquery.js
  3. +2 −2 Client/js/main.js
  4. +1 −1 app.js
View
10 Client/js/app.js
@@ -3,12 +3,14 @@
**/
define([], function () {
var app = Class.extend({
- init:function (IO) {
- this.socket = IO.connect('http://localhost:8080');
+ init:function () {
+ this.socket = io.connect('http://localhost:8080');
- this.socket.on('1', function () {
- console.log('on 1');
+
+ this.socket.on('1', function (data) {
+ console.log("recieved a 1");
});
+
},
});
View
12,966 Client/js/lib/require-jquery.js
6,265 additions, 6,701 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
4 Client/js/main.js
@@ -8,9 +8,9 @@ define(['jquery', 'lib/class', 'lib/socket.io', 'app'], function ($, Class, IO,
var initApp = function () {
$(document).ready(function () {
- app = new APP(IO);
+ app = new APP();
galaxies = app;
- })
+ });
};
View
2 app.js
@@ -9,7 +9,7 @@ var App = require('http').createServer(handler),
Player = require('./Server/Player'),
version = 0.1;
-IO.logLevel = 1;
+IO.set('log level', 1); //Reduce SocketIO output
var fileServer = new Static.Server('./Client');
App.listen(8080);// This is the port for our web server. You will need to go to http://localhost:8080 to see it

0 comments on commit 93f8d37

Please sign in to comment.