Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 18:01:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

closes #3000

Browse Source
This commit is contained in:
psychobunny
2015-04-17 13:44:47 -04:00
parent c188fa2a1f
commit 1d94b6a96f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
/* globals define, app, ajaxify, utils, socket, templates */
define('forum/chats', ['string', 'sounds', 'forum/infinitescroll', 'translator'], function(S, sounds, infinitescroll, translator) {
define('forum/chats', ['components', 'string', 'sounds', 'forum/infinitescroll', 'translator'], function(components, S, sounds, infinitescroll, translator) {
var Chats = {
initialised: false
};
@@ -69,9 +69,14 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll', 'translator']
uid = Chats.getRecipientUid();
if (app.previousUrl && app.previousUrl.match(/chats/)) {
var text = components.get('chat/input').val();
ajaxify.go('chats', function() {
app.openChat(username, uid);
}, true);
$(window).one('action:chat.loaded', function() {
components.get('chat/input').val(text);
});
} else {
window.history.go(-1);
}

7
public/src/modules/chat.js
View File

@@ -1,7 +1,7 @@
"use strict";
/* globals app, config, define, socket, templates, utils, ajaxify */
define('chat', ['taskbar', 'string', 'sounds', 'forum/chats', 'translator'], function(taskbar, S, sounds, Chats, translator) {
define('chat', ['components', 'taskbar', 'string', 'sounds', 'forum/chats', 'translator'], function(components, taskbar, S, sounds, Chats, translator) {
var module = {};
var newMessage = false;
@@ -205,6 +205,11 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats', 'translator'], fun
});
function gotoChats() {
var text = components.get('chat/input').val();
$(window).one('action:ajaxify.end', function() {
components.get('chat/input').val(text);
});
ajaxify.go('chats/' + utils.slugify(username));
module.close(chatModal);
}