Merge branch 'restructuring' of github.com:logsol/chuck.js into restructuring

This commit is contained in:
Jeena Paradies 2012-07-22 01:38:41 +02:00
commit 9ac1d61487
7 changed files with 32 additions and 19 deletions

11
app/Bootstrap/Client.js Executable file
View file

@ -0,0 +1,11 @@
requirejs.config({
baseUrl: 'app'
});
var inspector = {};
requirejs(["Bootstrap/Client"], function(Client) {
var client = new Client(location.href);
inspector.client = client;
});

View file

@ -36,7 +36,7 @@ function(http, nodeStatic) {
fileServer.serveFile('./node_modules/requirejs/require.js', 200, {}, req, res);
break;
case new RegExp(/^\/lib/).test(req.url):
case new RegExp(/^\/app/).test(req.url):
fileServer.serve(req, res, function(){
self.handleFileError(res)
});

View file

@ -1,7 +1,7 @@
define([
"Server/HttpServer",
"Server/Socket",
"Server/Coordinator"
"Bootstrap/HttpServer",
"Bootstrap/Socket",
"Lobby/Coordinator"
],
function(HttpServer, Socket, Coordinator) {

View file

@ -1,12 +0,0 @@
requirejs.config({
baseUrl: 'lib'
});
var inspector = {};
requirejs(["Client/Networker", "Vendor/SocketIO"], function(Networker, SocketIO) {
var socket = SocketIO.connect(location.href);
var networker = new Networker(socket);
inspector.networker = networker;
});