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

closes #209

Browse Source
This commit is contained in:
Baris Usakli
2013-08-30 14:25:59 -04:00
parent ad5e3ebce3
commit 7cff55a160
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
public/src/app.js
View File

@@ -314,6 +314,18 @@ var socket,
});
}
app.openChat = function(username, touid) {
require(['chat'], function(chat) {
var chatModal;
if(!chat.modalExists(touid)) {
chatModal = chat.createModal(username, touid);
} else {
chatModal = chat.getModal(touid);
}
chat.load(chatModal.attr('UUID'));
});
}
app.createNewPosts = function(data) {
data.posts[0].display_moderator_tools = 'none';
var html = templates.prepare(templates['topic'].blocks['posts']).parse(data),

10
public/src/forum/topic.js
View File

@@ -288,15 +288,7 @@
if(username === app.username || !app.username)
return;
require(['chat'], function(chat) {
var chatModal;
if(!chat.modalExists(touid)) {
chatModal = chat.createModal(username, touid);
} else {
chatModal = chat.getModal(touid);
}
chat.load(chatModal.attr('UUID'));
});
app.openChat(username, touid);
});
ajaxify.register_events([

2
src/websockets.js
View File

@@ -533,7 +533,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
notifText = 'New message from <strong>' + username + '</strong>';
if(!isUserOnline(touid)) {
notifications.create(notifText, 5, '#', 'notification_' + uid + '_' + touid, function(nid) {
notifications.create(notifText, 5, 'javascript:app.openChat(&apos;'+username+'&apos;, '+uid+');', 'notification_' + uid + '_' + touid, function(nid) {
notifications.push(nid, [touid], function(success) {
});