Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-17 03:01:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

started #1807

Browse Source
This commit is contained in:
Julian Lam
2014-07-09 10:55:22 -04:00
parent dae2e14aac
commit cd8c1eeff6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/language/en_GB/modules.json
View File

@@ -10,6 +10,8 @@
"chat.recent-chats": "Recent Chats", "chat.recent-chats": "Recent Chats",
"chat.contacts": "Contacts", "chat.contacts": "Contacts",
"chat.message-history": "Message History", "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_in": "%1 said in %2:\n",
"composer.user_said": "%1 said:\n", "composer.user_said": "%1 said:\n",

8
public/src/forum/chats.js
View File

@@ -38,7 +38,8 @@ define('forum/chats', ['string', 'sounds'], function(S, sounds) {
Chats.addEventListeners = function() { Chats.addEventListeners = function() {
var inputEl = $('.chat-input'), 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) { $('.chats-list').on('click', 'li', function(e) {
ajaxify.go('chats/' + utils.slugify($(this).attr('data-username'))); 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); Chats.sendMessage(Chats.getRecipientUid(), inputEl);
return false; return false;
}); });
popoutEl.on('click', function() {
app.openChat($('.expanded-chat').attr('data-username'), Chats.getRecipientUid());
ajaxify.go('chats');
});
}; };
Chats.addGlobalEventListeners = function() { Chats.addGlobalEventListeners = function() {