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

fixed flag post, added highlight to scroll post

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-24 17:19:49 -05:00
parent bbc2df11e1
commit 3ed2d21eb6
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/src/app.js
View File

@@ -290,14 +290,14 @@ var socket,
var el = jQuery(this), var el = jQuery(this),
uid = el.parents('li').attr('data-uid'); uid = el.parents('li').attr('data-uid');
translator.translate('[[global:' + users[uid].status + ']]', function(translated) {
if (uid && users[uid]) { if (uid && users[uid]) {
translator.translate('[[global:' + users[uid].status + ']]', function(translated) {
el.siblings('i') el.siblings('i')
.attr('class', 'fa fa-circle status ' + users[uid].status) .attr('class', 'fa fa-circle status ' + users[uid].status)
.attr('title', translated) .attr('title', translated)
.attr('data-original-title', translated); .attr('data-original-title', translated);
}
}); });
}
}); });
}); });
}; };

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

@@ -467,10 +467,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}); });
$('#post-container').on('click', '.flag', function() { $('#post-container').on('click', '.flag', function() {
var btn = $(this);
bootbox.confirm('Are you sure you want to flag this post?', function(confirm) { bootbox.confirm('Are you sure you want to flag this post?', function(confirm) {
if (confirm) { if (confirm) {
var pid = $(this).parents('.post-row').attr('data-pid'); var pid = btn.parents('.post-row').attr('data-pid');
socket.emit('posts.flag', pid, function(err) { socket.emit('posts.flag', pid, function(err) {
if(err) { if(err) {
return app.alertError(err.message); return app.alertError(err.message);
@@ -1096,6 +1096,12 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + "px" scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + "px"
}, duration !== undefined ? duration : 400, function() { }, duration !== undefined ? duration : 400, function() {
updateHeader(); updateHeader();
scrollTo.parent().addClass('highlight');
setTimeout(function() {
scrollTo.parent().removeClass('highlight');
}, 5000);
}); });
} }

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

@@ -266,7 +266,6 @@ SocketPosts.flag = function(socket, pid, callback) {
groups.getByGroupName('administrators', {}, next); groups.getByGroupName('administrators', {}, next);
}, },
function(adminGroup, next) { function(adminGroup, next) {
notifications.create({ notifications.create({
text: message, text: message,
path: path, path: path,