diff options
| author | Jules Laplace <jules@okfoc.us> | 2013-02-22 15:15:18 -0800 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2013-02-22 15:15:18 -0800 |
| commit | 1cf3491f7ff8fc03dc1db12452075ad1daaad775 (patch) | |
| tree | fe8a7f4e35ab2bc7113c21320e9df9bde8a55830 /public/js | |
| parent | 66c9c742c4efad7d72e72d13ef8b9c6040504a12 (diff) | |
cocapaint
Diffstat (limited to 'public/js')
| -rw-r--r-- | public/js/chat.js | 8 | ||||
| -rw-r--r-- | public/js/game.js | 3 |
2 files changed, 3 insertions, 8 deletions
diff --git a/public/js/chat.js b/public/js/chat.js index 76371c7..67b6255 100644 --- a/public/js/chat.js +++ b/public/js/chat.js @@ -26,8 +26,6 @@ var Chat = { $("#chat-message").val(""); Chat.add({ nick: Game.nick, body: body, you: true }); - scrollToBottom("#chat_container") - Events.send.message({ nick: Game.nick, body: body }); }, @@ -50,13 +48,13 @@ var Chat = { }, add: function (msg) { - var klass = msg.you ? "msg you" : "msg"; - var html = "<p><span class='" + klass + "'>"+msg.nick+"</span><span class='msg'>"+Chat.parse(msg.body)+"</span></p>"; + var klass = msg.nick == Game.nick ? "you" : ""; + var html = "<p><span class='nick " + klass + "'>"+msg.nick+"</span><span class='msg'>"+Chat.parse(msg.body)+"</span></p>"; $("#chat").append( html ); if ($("#chat p").length > 50) { $("#chat").first().remove(); } - scrollToBottom("#chat_container"); + scrollToBottom("#chat"); } } diff --git a/public/js/game.js b/public/js/game.js index 461d96e..3b0a71b 100644 --- a/public/js/game.js +++ b/public/js/game.js @@ -16,14 +16,12 @@ var Events = { receive: { join: function(data){ - console.log("RECEIVE JOIN") for (var i in data.messages) { Chat.add(data.messages[i]); } }, message: function(msg){ -console.log("RECEIVE MESSAGE") Chat.add(msg); } }, @@ -31,7 +29,6 @@ console.log("RECEIVE MESSAGE") send: { message: function(msg) { -console.log("SE D MMESSAGe") socket.emit('event-message', msg); } |