v1.18.x
Julian Lam 11 years ago
parent dae2e14aac
commit cd8c1eeff6

@ -10,6 +10,8 @@
"chat.recent-chats": "Recent Chats",
"chat.contacts": "Contacts",
"chat.message-history": "Message History",
"chat.pop-out": "Pop out chat",
"chat.maximize": "Maximize",
"composer.user_said_in": "%1 said in %2:\n",
"composer.user_said": "%1 said:\n",

@ -38,7 +38,8 @@ define('forum/chats', ['string', 'sounds'], function(S, sounds) {
Chats.addEventListeners = function() {
var inputEl = $('.chat-input'),
sendEl = $('.expanded-chat button[data-action="send"]');
sendEl = $('.expanded-chat button[data-action="send"]'),
popoutEl = $('[data-action="pop-out"]');
$('.chats-list').on('click', 'li', function(e) {
ajaxify.go('chats/' + utils.slugify($(this).attr('data-username')));
@ -62,6 +63,11 @@ define('forum/chats', ['string', 'sounds'], function(S, sounds) {
Chats.sendMessage(Chats.getRecipientUid(), inputEl);
return false;
});
popoutEl.on('click', function() {
app.openChat($('.expanded-chat').attr('data-username'), Chats.getRecipientUid());
ajaxify.go('chats');
});
};
Chats.addGlobalEventListeners = function() {
@ -120,7 +126,7 @@ define('forum/chats', ['string', 'sounds'], function(S, sounds) {
messagesList.height(viewportHeight-(fromTop+inputHeight+(margin*4)));
}
return;
};

Loading…
Cancel
Save