--- a/web/wp-admin/js/edit-comments.dev.js Thu Sep 16 15:45:36 2010 +0000
+++ b/web/wp-admin/js/edit-comments.dev.js Mon Nov 19 18:26:13 2012 +0100
@@ -1,43 +1,47 @@
var theList, theExtraList, toggleWithKeyboard = false;
+
(function($) {
+var getCount, updateCount, updatePending, dashboardTotals;
setCommentsList = function() {
- var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter;
+ var totalInput, perPageInput, pageInput, lastConfidentTime = 0, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList;
- totalInput = $('.tablenav input[name="_total"]', '#comments-form');
- perPageInput = $('.tablenav input[name="_per_page"]', '#comments-form');
- pageInput = $('.tablenav input[name="_page"]', '#comments-form');
+ totalInput = $('input[name="_total"]', '#comments-form');
+ perPageInput = $('input[name="_per_page"]', '#comments-form');
+ pageInput = $('input[name="_page"]', '#comments-form');
dimAfter = function( r, settings ) {
- var c = $('#' + settings.element);
+ var c = $('#' + settings.element), editRow, replyID, replyButton;
- if ( c.is('.unapproved') )
- c.find('div.comment_status').html('0')
- else
- c.find('div.comment_status').html('1')
+ editRow = $('#replyrow');
+ replyID = $('#comment_ID', editRow).val();
+ replyButton = $('#replybtn', editRow);
+
+ if ( c.is('.unapproved') ) {
+ if ( settings.data.id == replyID )
+ replyButton.text(adminCommentsL10n.replyApprove);
- $('span.pending-count').each( function() {
- var a = $(this), n, dif;
- n = a.html().replace(/[^0-9]+/g, '');
- n = parseInt(n,10);
- if ( isNaN(n) ) return;
- dif = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
- n = n + dif;
- if ( n < 0 ) { n = 0; }
- a.closest('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
- updateCount(a, n);
- dashboardTotals();
- });
+ c.find('div.comment_status').html('0');
+ } else {
+ if ( settings.data.id == replyID )
+ replyButton.text(adminCommentsL10n.reply);
+
+ c.find('div.comment_status').html('1');
+ }
+
+ var diff = $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1;
+ updatePending( diff );
};
// Send current total, page, per_page and url
delBefore = function( settings, list ) {
- var cl = $(settings.target).attr('className'), id, el, n, h, a, author, action = false;
+ var cl = $(settings.target).attr('class'), id, el, n, h, a, author, action = false;
settings.data._total = totalInput.val() || 0;
settings.data._per_page = perPageInput.val() || 0;
settings.data._page = pageInput.val() || 0;
settings.data._url = document.location.href;
+ settings.data.comment_status = $('input[name="comment_status"]', '#comments-form').val();
if ( cl.indexOf(':trash=1') != -1 )
action = 'trash';
@@ -49,6 +53,8 @@
el = $('#comment-' + id);
note = $('#' + action + '-undo-holder').html();
+ el.find('.check-column :checkbox').prop('checked', false); // Uncheck the row so as not to be affected by Bulk Edits.
+
if ( el.siblings('#replyrow').length && commentReply.cid == id )
commentReply.close();
@@ -63,10 +69,10 @@
el.before(h);
- $('strong', '#undo-' + id).text(author + ' ');
+ $('strong', '#undo-' + id).text(author);
a = $('.undo a', '#undo-' + id);
a.attr('href', 'comment.php?action=un' + action + 'comment&c=' + id + '&_wpnonce=' + settings.data._ajax_nonce);
- a.attr('className', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1 vim-z vim-destructive');
+ a.attr('class', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1 vim-z vim-destructive');
$('.avatar', el).clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
a.click(function(){
@@ -82,7 +88,7 @@
return settings;
};
- // Updates the current total (as displayed visibly)
+ // Updates the current total (stored in the _total input)
updateTotalCount = function( total, time, setConfidentTime ) {
if ( time < lastConfidentTime )
return;
@@ -91,12 +97,9 @@
lastConfidentTime = time;
totalInput.val( total.toString() );
- $('span.total-type-count').each( function() {
- updateCount( $(this), total );
- });
};
- function dashboardTotals(n) {
+ dashboardTotals = function(n) {
var dash = $('#dashboard_right_now'), total, appr, totalN, apprN;
n = n || 0;
@@ -111,17 +114,16 @@
apprN = totalN - getCount( $('span.pending-count', dash) ) - getCount( $('span.spam-count', dash) );
updateCount(total, totalN);
updateCount(appr, apprN);
+ };
- }
-
- function getCount(el) {
+ getCount = function(el) {
var n = parseInt( el.html().replace(/[^0-9]+/g, ''), 10 );
if ( isNaN(n) )
return 0;
return n;
- }
+ };
- function updateCount(el, n) {
+ updateCount = function(el, n) {
var n1 = '';
if ( isNaN(n) )
return;
@@ -134,11 +136,26 @@
n = n + n1;
}
el.html(n);
- }
+ };
+
+ updatePending = function( diff ) {
+ $('span.pending-count').each(function() {
+ var a = $(this), n = getCount(a) + diff;
+ if ( n < 1 )
+ n = 0;
+ a.closest('.awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
+ updateCount( a, n );
+ });
+
+ dashboardTotals();
+ };
// In admin-ajax.php, we send back the unix time stamp instead of 1 on success
delAfter = function( r, settings ) {
- var total, pageLinks, N, untrash = $(settings.target).parent().is('span.untrash'), unspam = $(settings.target).parent().is('span.unspam'), spam, trash;
+ var total, N, spam, trash, pending,
+ untrash = $(settings.target).parent().is('span.untrash'),
+ unspam = $(settings.target).parent().is('span.unspam'),
+ unapproved = $('#' + settings.element).is('.unapproved');
function getUpdate(s) {
if ( $(settings.target).parent().is('span.' + s) )
@@ -148,27 +165,28 @@
return 0;
}
- spam = getUpdate('spam');
- trash = getUpdate('trash');
if ( untrash )
trash = -1;
+ else
+ trash = getUpdate('trash');
+
if ( unspam )
spam = -1;
-
- $('span.pending-count').each( function() {
- var a = $(this), n = getCount(a), unapproved = $('#' + settings.element).is('.unapproved');
+ else
+ spam = getUpdate('spam');
- if ( $(settings.target).parent().is('span.unapprove') || ( ( untrash || unspam ) && unapproved ) ) { // we "deleted" an approved comment from the approved list by clicking "Unapprove"
- n = n + 1;
- } else if ( unapproved ) { // we deleted a formerly unapproved comment
- n = n - 1;
- }
- if ( n < 0 ) { n = 0; }
- a.closest('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0');
- updateCount(a, n);
- dashboardTotals();
- });
+ if ( $(settings.target).parent().is('span.unapprove') || ( ( untrash || unspam ) && unapproved ) ) {
+ // a comment was 'deleted' from another list (e.g. approved, spam, trash) and moved to pending,
+ // or a trash/spam of a pending comment was undone
+ pending = 1;
+ } else if ( unapproved ) {
+ // a pending comment was trashed/spammed/approved
+ pending = -1;
+ }
+
+ if ( pending )
+ updatePending(pending);
$('span.spam-count').each( function() {
var a = $(this), n = getCount(a) + spam;
@@ -185,29 +203,77 @@
dashboardTotals(N);
} else {
total = totalInput.val() ? parseInt( totalInput.val(), 10 ) : 0;
- total = total - spam - trash;
+ if ( $(settings.target).parent().is('span.undo') )
+ total++;
+ else
+ total--;
+
if ( total < 0 )
total = 0;
if ( ( 'object' == typeof r ) && lastConfidentTime < settings.parsed.responses[0].supplemental.time ) {
- pageLinks = settings.parsed.responses[0].supplemental.pageLinks || '';
- if ( $.trim( pageLinks ) )
- $('.tablenav-pages').find( '.page-numbers' ).remove().end().append( $( pageLinks ) );
- else
- $('.tablenav-pages').find( '.page-numbers' ).remove();
-
+ total_items_i18n = settings.parsed.responses[0].supplemental.total_items_i18n || '';
+ if ( total_items_i18n ) {
+ $('.displaying-num').text( total_items_i18n );
+ $('.total-pages').text( settings.parsed.responses[0].supplemental.total_pages_i18n );
+ $('.tablenav-pages').find('.next-page, .last-page').toggleClass('disabled', settings.parsed.responses[0].supplemental.total_pages == $('.current-page').val());
+ }
updateTotalCount( total, settings.parsed.responses[0].supplemental.time, true );
} else {
updateTotalCount( total, r, false );
}
}
- if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash ) {
+ if ( ! theExtraList || theExtraList.size() == 0 || theExtraList.children().size() == 0 || untrash || unspam ) {
return;
}
theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
- $('#get-extra-comments').submit();
+
+ refillTheExtraList();
+ };
+
+ refillTheExtraList = function(ev) {
+ var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name="_per_page"]', '#comments-form').val();
+
+ if (! args.paged)
+ args.paged = 1;
+
+ if (args.paged > total_pages) {
+ return;
+ }
+
+ if (ev) {
+ theExtraList.empty();
+ args.number = Math.min(8, per_page); // see WP_Comments_List_Table::prepare_items() @ class-wp-comments-list-table.php
+ } else {
+ args.number = 1;
+ args.offset = Math.min(8, per_page) - 1; // fetch only the next item on the extra list
+ }
+
+ args.no_placeholder = true;
+
+ args.paged ++;
+
+ // $.query.get() needs some correction to be sent into an ajax request
+ if ( true === args.comment_type )
+ args.comment_type = '';
+
+ args = $.extend(args, {
+ 'action': 'fetch-list',
+ 'list_args': list_args,
+ '_ajax_fetch_list_nonce': $('#_ajax_fetch_list_nonce').val()
+ });
+
+ $.ajax({
+ url: ajaxurl,
+ global: false,
+ dataType: 'json',
+ data: args,
+ success: function(response) {
+ theExtraList.get(0).wpList.add( response.rows );
+ }
+ });
};
theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
@@ -249,6 +315,9 @@
this.comments_listing = $('#comments-form > input[name="comment_status"]').val() || '';
+ /* $(listTable).bind('beforeChangePage', function(){
+ commentReply.close();
+ }); */
},
addEvents : function(r) {
@@ -277,80 +346,84 @@
},
close : function() {
- var c;
+ var c, replyrow = $('#replyrow');
- if ( this.cid ) {
+ // replyrow is not showing?
+ if ( replyrow.parent().is('#com-reply') )
+ return;
+
+ if ( this.cid && this.act == 'edit-comment' ) {
c = $('#comment-' + this.cid);
-
- if ( this.act == 'edit-comment' )
- c.fadeIn(300, function(){ c.show() }).css('backgroundColor', '');
+ c.fadeIn(300, function(){ c.show() }).css('backgroundColor', '');
+ }
- $('#replyrow').hide();
- $('#com-reply').append( $('#replyrow') );
- $('#replycontent').val('');
- $('input', '#edithead').val('');
- $('.error', '#replysubmit').html('').hide();
- $('.waiting', '#replysubmit').hide();
+ // reset the Quicktags buttons
+ if ( typeof QTags != 'undefined' )
+ QTags.closeAllTags('replycontent');
+
+ $('#add-new-comment').css('display', '');
- if ( $.browser.msie )
- $('#replycontainer, #replycontent').css('height', '120px');
- else
- $('#replycontainer').resizable('destroy').css('height', '120px');
+ replyrow.hide();
+ $('#com-reply').append( replyrow );
+ $('#replycontent').css('height', '').val('');
+ $('#edithead input').val('');
+ $('.error', replyrow).html('').hide();
+ $('.waiting', replyrow).hide();
- this.cid = '';
- }
+ this.cid = '';
},
- open : function(id, p, a) {
- var t = this, editRow, rowData, act, h, c = $('#comment-' + id);
+ open : function(comment_id, post_id, action) {
+ var t = this, editRow, rowData, act, c = $('#comment-' + comment_id), h = c.height(), replyButton;
+
t.close();
- t.cid = id;
+ t.cid = comment_id;
- $('td', '#replyrow').attr('colspan', $('table.widefat thead th:visible').length);
editRow = $('#replyrow');
- rowData = $('#inline-'+id);
- act = t.act = (a == 'edit') ? 'edit-comment' : 'replyto-comment';
+ rowData = $('#inline-'+comment_id);
+ action = action || 'replyto';
+ act = 'edit' == action ? 'edit' : 'replyto';
+ act = t.act = act + '-comment';
$('#action', editRow).val(act);
- $('#comment_post_ID', editRow).val(p);
- $('#comment_ID', editRow).val(id);
+ $('#comment_post_ID', editRow).val(post_id);
+ $('#comment_ID', editRow).val(comment_id);
- if ( a == 'edit' ) {
+ if ( h > 120 )
+ $('#replycontent', editRow).css('height', (35+h) + 'px');
+
+ if ( action == 'edit' ) {
$('#author', editRow).val( $('div.author', rowData).text() );
$('#author-email', editRow).val( $('div.author-email', rowData).text() );
$('#author-url', editRow).val( $('div.author-url', rowData).text() );
$('#status', editRow).val( $('div.comment_status', rowData).text() );
$('#replycontent', editRow).val( $('textarea.comment', rowData).val() );
$('#edithead, #savebtn', editRow).show();
- $('#replyhead, #replybtn', editRow).hide();
-
- h = c.height();
- if ( h > 220 )
- if ( $.browser.msie )
- $('#replycontainer, #replycontent', editRow).height(h-105);
- else
- $('#replycontainer', editRow).height(h-105);
+ $('#replyhead, #replybtn, #addhead, #addbtn', editRow).hide();
c.after( editRow ).fadeOut('fast', function(){
$('#replyrow').fadeIn(300, function(){ $(this).show() });
});
- } else {
- $('#edithead, #savebtn', editRow).hide();
+ } else if ( action == 'add' ) {
+ $('#addhead, #addbtn', editRow).show();
+ $('#replyhead, #replybtn, #edithead, #editbtn', editRow).hide();
+ $('#the-comment-list').prepend(editRow);
+ $('#replyrow').fadeIn(300);
+ } else {
+ replyButton = $('#replybtn', editRow);
+ $('#edithead, #savebtn, #addhead, #addbtn', editRow).hide();
$('#replyhead, #replybtn', editRow).show();
c.after(editRow);
+
+ if ( c.hasClass('unapproved') ) {
+ replyButton.text(adminCommentsL10n.replyApprove);
+ } else {
+ replyButton.text(adminCommentsL10n.reply);
+ }
+
$('#replyrow').fadeIn(300, function(){ $(this).show() });
}
- if ( ! $.browser.msie )
- $('#replycontainer').resizable({
- handles : 's',
- axis : 'y',
- minHeight : 80,
- stop : function() {
- $('#replycontainer').width('auto');
- }
- });
-
setTimeout(function() {
var rtop, rbottom, scrollTop, vp, scrollBottom;
@@ -377,15 +450,21 @@
send : function() {
var post = {};
+ $('#replysubmit .error').hide();
$('#replysubmit .waiting').show();
- $('#replyrow input').each(function() {
- post[ $(this).attr('name') ] = $(this).val();
+ $('#replyrow input').not(':button').each(function() {
+ var t = $(this);
+ post[ t.attr('name') ] = t.val();
});
post.content = $('#replycontent').val();
post.id = post.comment_post_ID;
post.comments_listing = this.comments_listing;
+ post.p = $('[name="p"]').val();
+
+ if ( $('#comment-' + $('#comment_ID').val()).hasClass('unapproved') )
+ post.approve_parent = 1;
$.ajax({
type : 'POST',
@@ -399,37 +478,56 @@
},
show : function(xml) {
- var r, c, id, bg;
+ var t = this, r, c, id, bg, pid;
if ( typeof(xml) == 'string' ) {
- this.error({'responseText': xml});
+ t.error({'responseText': xml});
return false;
}
r = wpAjax.parseAjaxResponse(xml);
if ( r.errors ) {
- this.error({'responseText': wpAjax.broken});
+ t.error({'responseText': wpAjax.broken});
return false;
}
+ t.revert();
+
r = r.responses[0];
c = r.data;
id = '#comment-' + r.id;
- if ( 'edit-comment' == this.act )
+
+ if ( 'edit-comment' == t.act )
$(id).remove();
+ if ( r.supplemental.parent_approved ) {
+ pid = $('#comment-' + r.supplemental.parent_approved);
+ updatePending( -1 );
+
+ if ( this.comments_listing == 'moderated' ) {
+ pid.animate( { 'backgroundColor':'#CCEEBB' }, 400, function(){
+ pid.fadeOut();
+ });
+ return;
+ }
+ }
+
$(c).hide()
$('#replyrow').after(c);
-
- this.revert();
- this.addEvents($(id));
- bg = $(id).hasClass('unapproved') ? '#ffffe0' : '#fff';
+ id = $(id);
+ t.addEvents(id);
+ bg = id.hasClass('unapproved') ? '#FFFFE0' : id.closest('.widefat, .postbox').css('backgroundColor');
- $(id)
- .animate( { 'backgroundColor':'#CCEEBB' }, 600 )
- .animate( { 'backgroundColor': bg }, 600 );
+ id.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
+ .animate( { 'backgroundColor': bg }, 300, function() {
+ if ( pid && pid.length ) {
+ pid.animate( { 'backgroundColor':'#CCEEBB' }, 300 )
+ .animate( { 'backgroundColor': bg }, 300 )
+ .removeClass('unapproved').addClass('approved')
+ .find('div.comment_status').html('1');
+ }
+ });
- $.fn.wpList.process($(id))
},
error : function(r) {
@@ -443,6 +541,16 @@
if ( er )
$('#replysubmit .error').html(er).show();
+ },
+
+ addcomment: function(post_id) {
+ var t = this;
+
+ $('#add-new-comment').fadeOut(200, function(){
+ t.open(0, post_id, 'add');
+ $('table.comments-box').css('display', '');
+ $('#no-comments').remove();
+ });
}
};
@@ -451,10 +559,7 @@
setCommentsList();
commentReply.init();
- $('span.delete a.delete').click(function(){return false;});
-
- if ( typeof QTags != 'undefined' )
- ed_reply = new QTags('ed_reply', 'replycontent', 'replycontainer', 'more');
+ $(document).delegate('span.delete a.delete', 'click', function(){return false;});
if ( typeof $.table_hotkeys != 'undefined' ) {
make_hotkeys_redirect = function(which) {
@@ -462,7 +567,7 @@
var first_last, l;
first_last = 'next' == which? 'first' : 'last';
- l = $('.'+which+'.page-numbers');
+ l = $('.tablenav-pages .'+which+'-page:not(.disabled)');
if (l.length)
window.location = l[0].href.replace(/\&hotkeys_highlight_(first|last)=1/g, '')+'&hotkeys_highlight_'+first_last+'=1';
}
@@ -474,22 +579,22 @@
toggle_all = function() {
toggleWithKeyboard = true;
- $('input:checkbox', '#cb').click().attr('checked', '');
+ $('input:checkbox', '#cb').click().prop('checked', false);
toggleWithKeyboard = false;
};
make_bulk = function(value) {
return function() {
var scope = $('select[name="action"]');
- $('option[value='+value+']', scope).attr('selected', 'selected');
- $('#comments-form').submit();
+ $('option[value="' + value + '"]', scope).prop('selected', true);
+ $('#doaction').click();
}
};
$.table_hotkeys(
$('table.widefat'),
['a', 'u', 's', 'd', 'r', 'q', 'z', ['e', edit_comment], ['shift+x', toggle_all],
- ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('markspam')],
+ ['shift+a', make_bulk('approve')], ['shift+s', make_bulk('spam')],
['shift+d', make_bulk('delete')], ['shift+t', make_bulk('trash')],
['shift+z', make_bulk('untrash')], ['shift+u', make_bulk('unapprove')]],
{ highlight_first: adminCommentsL10n.hotkeys_highlight_first, highlight_last: adminCommentsL10n.hotkeys_highlight_last,