diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 5b9712a0..550dd931 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -132,17 +132,7 @@ function initCallbacks() { }); socket.on("chatMsg", function(data) { - if(IGNORED.indexOf(data.username) != -1) { - return; - } - var div = formatChatMessage(data); - div.appendTo($("#messagebuffer")); - // Cap chatbox at most recent 100 messages - if($("#messagebuffer").children().length > 100) { - $($("#messagebuffer").children()[0]).remove(); - } - if(SCROLLCHAT) - $("#messagebuffer").scrollTop($("#messagebuffer").prop("scrollHeight")); + addChatMessage(data); }); socket.on("userlist", function(data) { diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js index 966e3740..0576c48d 100644 --- a/www/assets/js/functions.js +++ b/www/assets/js/functions.js @@ -155,6 +155,20 @@ function addUserDropdown(entry, name) { return ul; } +function addChatMessage(data) { + if(IGNORED.indexOf(data.username) != -1) { + return; + } + var div = formatChatMessage(data); + div.appendTo($("#messagebuffer")); + // Cap chatbox at most recent 100 messages + if($("#messagebuffer").children().length > 100) { + $($("#messagebuffer").children()[0]).remove(); + } + if(SCROLLCHAT) + $("#messagebuffer").scrollTop($("#messagebuffer").prop("scrollHeight")); +} + function formatChatMessage(data) { var div = $("
"); if(uname) { @@ -683,3 +697,10 @@ function onWindowFocus() { clearInterval(TITLE_BLINK); document.title = PAGETITLE; } + +function enableBerrymotes() { + $.getScript("./assets/js/berrymotes.js", function() { + berryEmoteDataRefresh(); + monkeyPatchChat(); + }); +}