summaryrefslogtreecommitdiff
path: root/server.js
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2013-02-22 12:11:24 -0800
committerJules Laplace <jules@okfoc.us>2013-02-22 12:11:24 -0800
commit6d0132c4a9fd25afe7633f1eabb0f498f5ec8d6b (patch)
treef599086e2a3cce10c7858c10746681aaa408ba57 /server.js
parentd1ee2061ffc8a1b311a9c9c0ef1eb4ffde351501 (diff)
gitignore
Diffstat (limited to 'server.js')
-rw-r--r--server.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/server.js b/server.js
index e8d0aec..575b526 100644
--- a/server.js
+++ b/server.js
@@ -4,8 +4,7 @@ var express = require('express'),
app = express(),
http = require('http'),
server = http.createServer(app),
- io = require('socket.io').listen(server),
- mongoose = require('mongoose');
+ io = require('socket.io').listen(server);
var s3 = knox.createClient({
key: process.env.ASDF_S3_KEY,
@@ -55,11 +54,6 @@ app.post('/upload', function(req, res) {
/******************************* WEBSOCKETS
*/
-io.sockets.on( 'connection', function(socket){
- socket.emit( 'join', Channel.join() );
- function echo
-});
-
var State = {
WAITING: 0,
DRAWING: 1,
@@ -94,6 +88,12 @@ Channel.prototype.join = function(){
}
}
+
+var game = new Channel ();
+io.sockets.on( 'connection', function(socket){
+ socket.emit( 'join', game.join() );
+});
+
/******************************* DONE
*/