WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comments: Avoid extra AJAX requests when undoing Spam or Trash actions. 

Props afercia.
Fixes #35904.
Built from https://develop.svn.wordpress.org/trunk@36774


git-svn-id: http://core.svn.wordpress.org/trunk@36741 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-02-29 03:20:26 +00:00
parent 3cd78105dd
commit 2099e388bb
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/js/edit-comments.js
View File

@ -286,6 +286,7 @@ setCommentsList = function() {
a.click(function( e ){ a.click(function( e ){
e.preventDefault(); e.preventDefault();
e.stopPropagation(); // ticket #35904
list.wpList.del(this); list.wpList.del(this);
$('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){ $('#undo-' + id).css( {backgroundColor:'#ceb'} ).fadeOut(350, function(){
$(this).remove(); $(this).remove();
@ -313,7 +314,8 @@ setCommentsList = function() {
approved = commentRow.hasClass( 'approved' ), approved = commentRow.hasClass( 'approved' ),
unapproved = commentRow.hasClass( 'unapproved' ), unapproved = commentRow.hasClass( 'unapproved' ),
spammed = commentRow.hasClass( 'spam' ), spammed = commentRow.hasClass( 'spam' ),
trashed = commentRow.hasClass( 'trash' ); trashed = commentRow.hasClass( 'trash' ),
undoing = false; // ticket #35904
updateDashboardText( newTotal ); updateDashboardText( newTotal );
@ -347,6 +349,8 @@ setCommentsList = function() {
} }
} }
undoing = true;
// user clicked "Spam" // user clicked "Spam"
} else if ( targetParent.is( 'span.spam' ) ) { } else if ( targetParent.is( 'span.spam' ) ) {
// the comment is currently approved // the comment is currently approved
@ -481,7 +485,7 @@ setCommentsList = function() {
} }
} }
if ( ! theExtraList || theExtraList.length === 0 || theExtraList.children().length === 0 ) { if ( ! theExtraList || theExtraList.length === 0 || theExtraList.children().length === 0 || undoing ) {
return; return;
} }

2
wp-admin/js/edit-comments.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-beta1-36773'; $wp_version = '4.5-beta1-36774';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.