diff --git a/wp-admin/js/edit-comments.js b/wp-admin/js/edit-comments.js index 405758c674..470d4edc6e 100644 --- a/wp-admin/js/edit-comments.js +++ b/wp-admin/js/edit-comments.js @@ -17,8 +17,11 @@ setCommentsList = function() { if ( isNaN(n) ) return; n = n + ( $('#' + settings.element).is('.' + settings.dimClass) ? 1 : -1 ); if ( n < 0 ) { n = 0; } - a.html( n.toString() ); $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0'); + n = n.toString(); + if ( n.length > 3 ) + n = n.substr(0, n.length-3)+' '+n.substr(-3); + a.html(n); }); }; @@ -34,8 +37,11 @@ setCommentsList = function() { n = n + 1; } if ( n < 0 ) { n = 0; } - a.html( n.toString() ); $('#awaiting-mod')[ 0 == n ? 'addClass' : 'removeClass' ]('count-0'); + n = n.toString(); + if ( n.length > 3 ) + n = n.substr(0, n.length-3)+' '+n.substr(-3); + a.html(n); }); $('span.spam-count' ).each( function() { @@ -49,7 +55,10 @@ setCommentsList = function() { n = n - 1; } if ( n < 0 ) { n = 0; } - a.html( n.toString() ); + n = n.toString(); + if ( n.length > 3 ) + n = n.substr(0, n.length-3)+' '+n.substr(-3); + a.html(n); }); if ( theExtraList.size() == 0 || theExtraList.children().size() == 0 ) { diff --git a/wp-admin/js/inline-edit-post.js b/wp-admin/js/inline-edit-post.js index dd1a8fd525..5f6cd77cfb 100644 --- a/wp-admin/js/inline-edit-post.js +++ b/wp-admin/js/inline-edit-post.js @@ -11,11 +11,8 @@ inlineEditPost = { // get all editable rows t.rows = $('tr.iedit'); - // prepare the edit row -// .dblclick(function() { inlineEditPost.toggle(this); }) + // prepare the edit rows qeRow.keyup(function(e) { if(e.which == 27) return inlineEditPost.revert(); }); - -// .dblclick(function() { inlineEditPost.revert(); }) bulkRow.keyup(function(e) { if (e.which == 27) return inlineEditPost.revert(); }); $('a.cancel', qeRow).click(function() { return inlineEditPost.revert(); }); @@ -25,7 +22,6 @@ inlineEditPost = { $('a.cancel', bulkRow).click(function() { return inlineEditPost.revert(); }); // add events -// t.rows.dblclick(function() { inlineEditPost.toggle(this); }); t.addEvents(t.rows); $('#bulk-title-div').parents('fieldset').after( @@ -51,17 +47,9 @@ inlineEditPost = { $('select[name="_status"] option[value="future"]', bulkRow).remove(); - $('#doaction').click(function(e){ - if ( $('select[name="action"]').val() == 'edit' ) { - e.preventDefault(); - t.setBulk(); - } else if ( $('form#posts-filter tr.inline-editor').length > 0 ) { - t.revert(); - } - }); - - $('#doaction2').click(function(e){ - if ( $('select[name="action2"]').val() == 'edit' ) { + $('#doaction, #doaction2').click(function(e){ + var n = $(this).attr('id').substr(2); + if ( $('select[name="'+n+'"]').val() == 'edit' ) { e.preventDefault(); t.setBulk(); } else if ( $('form#posts-filter tr.inline-editor').length > 0 ) { @@ -205,6 +193,7 @@ inlineEditPost = { $.post('admin-ajax.php', params, function(r) { var row = $(inlineEditPost.what+id); + $('table.widefat .inline-edit-save .waiting').hide(); if (r) { if ( -1 != r.indexOf('