From b7f0c90bf76e168656181ba02faf52f09be5a4d8 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Thu, 16 Jan 2014 22:44:34 -0500 Subject: [PATCH] more fixes --- public/src/app.js | 34 +++++++--------------------------- public/src/forum/topic.js | 5 ++++- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index bce01992af..99b4b29615 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -250,42 +250,22 @@ var socket, var uids = []; jQuery('.post-row').each(function () { - uids.push(this.getAttribute('data-uid')); + var uid = $(this).attr('data-uid'); + if(uids.indexOf(uid) === -1) { + uids.push(uid); + } }); socket.emit('user.getOnlineUsers', uids, function (err, users) { - jQuery('a.username-field').each(function () { - if (this.processed === true) - return; - + jQuery('button .username-field').each(function (index, element) { var el = jQuery(this), uid = el.parents('li').attr('data-uid'); if (uid && jQuery.inArray(uid, users) !== -1) { - el.find('i').remove(); - el.prepend(''); + el.parent().addClass('btn-success').removeClass('btn-danger'); } else { - el.find('i').remove(); - el.prepend(''); + el.parent().addClass('btn-danger').removeClass('btn-success'); } - - el.processed = true; - }); - jQuery('button .username-field').each(function () { - //DRY FAIL - if (this.processed === true) - return; - - var el = jQuery(this), - uid = el.parents('li').attr('data-uid'); - - if (uid && jQuery.inArray(uid, users) !== -1) { - el.parent().addClass('btn-success'); - } else { - el.parent().addClass('btn-danger'); - } - - el.processed = true; }); }); }; diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index b93060dd09..74b3c3e6af 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -1049,7 +1049,10 @@ define(['composer'], function(composer) { .fadeIn('slow'); for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) { - socket.emit('posts.getPrivileges', data.posts[x].pid, function(privileges) { + socket.emit('posts.getPrivileges', data.posts[x].pid, function(err, privileges) { + if(err) { + return app.alertError(err.message); + } toggle_mod_tools(privileges.pid, privileges.editable); }); }