From a663f95669d9bfa286a75b9626fd273cdfee91b9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Wed, 26 Aug 2015 16:32:32 -0400 Subject: [PATCH] chats.loadChats() --- public/src/modules/chat.js | 91 ++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index f77ecf6281..4c934b19b8 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -8,8 +8,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra module.prepareDOM = function() { var chatsToggleEl = components.get('chat/dropdown'), - chatsListEl = components.get('chat/list'), - dropdownEl; + chatsListEl = components.get('chat/list'); // Sync open chats between all user socket sessions module.sync(); @@ -19,46 +18,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra return; } - socket.emit('modules.chats.getRecentChats', {after: 0}, function(err, chats) { - if (err) { - return app.alertError(err.message); - } - chats = chats.users; - var userObj; - - chatsListEl.empty(); - - if (!chats.length) { - translator.translate('[[modules:chat.no_active]]', function(str) { - $('
  • ') - .addClass('no_active') - .html('' + str + '') - .appendTo(chatsListEl); - }); - return; - } - - for(var x = 0; x') - .attr('data-uid', userObj.uid) - .html(''+ - '' + - ' ' + - userObj.username + '') - .appendTo(chatsListEl); - - (function(userObj) { - dropdownEl.click(function() { - if (!ajaxify.currentPage.match(/^chats\//)) { - app.openChat(userObj.username, userObj.uid); - } else { - ajaxify.go('chats/' + utils.slugify(userObj.username)); - } - }); - })(userObj); - } - }); + module.loadChats(chatsListEl); }); socket.on('event:chats.receive', function(data) { @@ -139,7 +99,7 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra username: chatObj.options.title, uid: chatObj.options.touid, new: chatObj.element.hasClass('new') - } + }; }); callback(null, chats); @@ -170,6 +130,51 @@ define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'tra }); }; + module.loadChats = function(chatsListEl) { + var dropdownEl; + + socket.emit('modules.chats.getRecentChats', {after: 0}, function(err, chats) { + if (err) { + return app.alertError(err.message); + } + chats = chats.users; + var userObj; + + chatsListEl.empty(); + + if (!chats.length) { + translator.translate('[[modules:chat.no_active]]', function(str) { + $('
  • ') + .addClass('no_active') + .html('' + str + '') + .appendTo(chatsListEl); + }); + return; + } + + for(var x = 0; x') + .attr('data-uid', userObj.uid) + .html(''+ + '' + + ' ' + + userObj.username + '') + .appendTo(chatsListEl); + + (function(userObj) { + dropdownEl.click(function() { + if (!ajaxify.currentPage.match(/^chats\//)) { + app.openChat(userObj.username, userObj.uid); + } else { + ajaxify.go('chats/' + utils.slugify(userObj.username)); + } + }); + })(userObj); + } + }); + }; + module.bringModalToTop = function(chatModal) { var topZ = 0;