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

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-03-01 19:15:25 -05:00
parent b6d97281d3 a9b78d2600
commit b2f9184562
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/src/modules/composer.js
View File

@@ -390,12 +390,12 @@ define(['taskbar'], function(taskbar) {
composer.createNewComposer(post_uuid);
}
var tid = templates.get('topic_id');
if (tid) {
var postData = composer.posts[post_uuid];
if (postData.tid) {
// Replying to a topic
socket.emit('modules.composer.register', {
uuid: post_uuid,
tid: templates.get('topic_id'),
tid: postData.tid,
uid: app.uid
});
}
@@ -842,6 +842,8 @@ define(['taskbar'], function(taskbar) {
postContainer.css('visibility', 'hidden');
composer.active = undefined;
taskbar.minimize('composer', post_uuid);
socket.emit('modules.composer.unregister', post_uuid);
};
return {

1
src/socket.io/modules.js
View File

@@ -78,6 +78,7 @@ SocketModules.composer.renderHelp = function(socket, data, callback) {
SocketModules.composer.register = function(socket, data) {
var now = Date.now();
server.in('topic_' + data.tid).emit('event:topic.replyStart', data.uid);
data.socket = socket;