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

Fix #3470

Browse Source
This commit is contained in:
Julian Lam
2015-08-24 11:34:09 -04:00
parent 7de782c78b
commit 902d11c6af
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/src/client/chats.js
View File

@@ -66,20 +66,21 @@ define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll',
popoutEl.on('click', function() { popoutEl.on('click', function() {
var username = $('.expanded-chat').attr('data-username'), var username = $('.expanded-chat').attr('data-username'),
uid = Chats.getRecipientUid(); uid = Chats.getRecipientUid(),
text = components.get('chat/input').val();
if (app.previousUrl && app.previousUrl.match(/chats/)) { if (app.previousUrl && app.previousUrl.match(/chats/)) {
var text = components.get('chat/input').val();
ajaxify.go('chats', function() { ajaxify.go('chats', function() {
app.openChat(username, uid); app.openChat(username, uid);
}, true); }, true);
$(window).one('action:chat.loaded', function() {
components.get('chat/input').val(text);
});
} else { } else {
window.history.go(-1); window.history.go(-1);
app.openChat(username, uid);
} }
$(window).one('action:chat.loaded', function() {
components.get('chat/input').val(text);
});
}); });
$('.recent-chats').on('scroll', function() { $('.recent-chats').on('scroll', function() {