interim commit to thread moving

This commit is contained in:
Julian Lam
2013-05-08 14:09:50 -04:00
parent 4dced643c5
commit ff025f0e48
5 changed files with 167 additions and 14 deletions

View File

@@ -34,7 +34,7 @@ var RDB = require('./redis.js'),
'user_rep' : user_data[uid].reputation || 0,
'gravatar' : user_data[uid].picture,
'fav_star_class' : vote_data[pid] ? 'icon-star' : 'icon-star-empty',
'display_moderator_tools' : uid == current_user ? 'show' : 'hide'
'display_moderator_tools' : uid == current_user ? 'show' : 'none'
});
}

View File

@@ -83,10 +83,10 @@ var RDB = require('./redis.js'),
'relativeTime': utils.relativeTime(timestamp[i]),
'slug' : slug[i],
'post_count' : postcount[i],
'lock-icon': locked[i] === '1' ? 'icon-lock' : 'hide',
'lock-icon': locked[i] === '1' ? 'icon-lock' : 'none',
'deleted': deleted[i],
'pinned': parseInt(pinned[i] || 0), // For sorting purposes
'pin-icon': pinned[i] === '1' ? 'icon-pushpin' : 'hide'
'pin-icon': pinned[i] === '1' ? 'icon-pushpin' : 'none'
});
}
@@ -287,4 +287,10 @@ var RDB = require('./redis.js'),
}
});
}
Topics.move = function(tid, cid, socket) {
moved = true; // nibstayla
if (moved) socket.emit('api:topic.move', { status: 'ok' });
else socket.emit('api:topic.move', { status: 'error' });
}
}(exports));

View File

@@ -200,6 +200,16 @@ var SocketIO = require('socket.io').listen(global.server,{log:false}),
socket.on('api:topic.unpin', function(data) {
modules.topics.unpin(data.tid, uid, socket);
});
socket.on('api:categories.get', function() {
modules.categories.get(function(categories) {
socket.emit('api:categories.get', categories);
});
});
socket.on('api:topic.move', function(data) {
modules.topics.move(data.tid, data.cid, socket);
});
});
}(SocketIO));