fixed merge conflicts

This commit is contained in:
Peter 'Pita' Martischka 2011-08-15 16:58:22 +01:00
commit 255dc5a325
7 changed files with 71 additions and 4 deletions

View file

@ -44,6 +44,13 @@ var chat = (function()
});
});
},
showHistory: function()
{
// this is a placeholder for the showHistory function
// load the messages from the server
// append them to the UI using addMessage
self.scrollDown(); // scroll down to the bottom of the chat
},
hide: function ()
{
$("#chatcounter").text("0");