From cd8c1eeff6b5884ae710e604c7cbadebb6b7d6ba Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Wed, 9 Jul 2014 10:55:22 -0400
Subject: [PATCH] started #1807
---
public/language/en_GB/modules.json | 2 ++
public/src/forum/chats.js | 10 ++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/public/language/en_GB/modules.json b/public/language/en_GB/modules.json
index 44fd976173..fdaf14dd5b 100644
--- a/public/language/en_GB/modules.json
+++ b/public/language/en_GB/modules.json
@@ -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",
diff --git a/public/src/forum/chats.js b/public/src/forum/chats.js
index c9b438bae9..78d07b3b60 100644
--- a/public/src/forum/chats.js
+++ b/public/src/forum/chats.js
@@ -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;
};