summaryrefslogtreecommitdiff
path: root/public/js/lib/views/room
diff options
context:
space:
mode:
authorJules Laplace <jules@okfoc.us>2015-08-05 21:40:04 -0400
committerJules Laplace <jules@okfoc.us>2015-08-05 21:40:04 -0400
commit0809c1c3a02943d51c6882039004365daa3e3920 (patch)
tree59470955758c75ca049090d608cd6ff183f5ba01 /public/js/lib/views/room
parent4514c2c49f0e0ec7cf9911dc254a8d20644d5def (diff)
functioning chat
Diffstat (limited to 'public/js/lib/views/room')
-rw-r--r--public/js/lib/views/room/chat.js2
-rw-r--r--public/js/lib/views/room/room.js2
2 files changed, 3 insertions, 1 deletions
diff --git a/public/js/lib/views/room/chat.js b/public/js/lib/views/room/chat.js
index 2c1140e..058d02d 100644
--- a/public/js/lib/views/room/chat.js
+++ b/public/js/lib/views/room/chat.js
@@ -45,7 +45,7 @@ var ChatView = View.extend({
msg.nick = user.username
msg.date = +new Date
this.add(msg)
- app.socket.send("message", msg)
+ app.socket.emit("message", msg)
},
empty: function(){
diff --git a/public/js/lib/views/room/room.js b/public/js/lib/views/room/room.js
index c8d7f3f..10c4d08 100644
--- a/public/js/lib/views/room/room.js
+++ b/public/js/lib/views/room/room.js
@@ -11,6 +11,8 @@ var RoomView = View.extend({
this.userlist = new UserlistView ()
app.socket = ws.connect(name)
+
+ app.socket.emit("join", { nick: user.username })
app.socket.on("joined", function(msgs){
msgs && msgs.forEach(chat.add)