Ticket #13363: 13363.3.diff

src/js/_enqueues/admin/edit-comments.js

@@ -302 +302 @@
  */
 window.setCommentsList = function() {
         var totalInput, perPageInput, pageInput, dimAfter, delBefore, updateTotalCount, delAfter, refillTheExtraList, diff,
-                lastConfidentTime = 0;
+        getActionFromClass, showUndo, lastConfidentTime = 0;
 
         totalInput = $('input[name="_total"]', '#comments-form');
         perPageInput = $('input[name="_per_page"]', '#comments-form');
@@ -338 +338 @@
                 totalInput.val( total.toString() );
         };
 
+        getActionFromClass = function( wpListsData ) {
+                if ( wpListsData.indexOf(':trash=1') != -1 ) {
+                        return {
+                                action: 'trash',
+                                undoAction: 'untrash',
+                                undoClass: ':untrash=1',
+                        };
+                }
+                else if ( wpListsData.indexOf(':spam=1') != -1 ) {
+                        return {
+                                action: 'spam',
+                                undoAction: 'unspam',
+                                undoClass: ':unspam=1',
+                        };
+                }
+                else if ( wpListsData.indexOf(':action=dim-comment&new=approved') != -1 ) {
+                        return {
+                                action: 'approve',
+                                undoAction: 'unapprove',
+                                undoClass: 'e7e7d3:action=dim-comment&new=unapproved',
+                        };
+                }
+                else if ( wpListsData.indexOf(':action=dim-comment&new=unapproved') != -1 ) {
+                        return {
+                                action: 'unapprove',
+                                undoAction: 'approve',
+                                undoClass: 'e7e7d3:action=dim-comment&new=approved',
+                        };
+                }
+                return false;
+        };
+
         /**
          * Changes DOM that need to be changed after a list item has been dimmed.
          *
@@ -402 +434 @@
          * @return {Object} The settings object.
          */
         delBefore = function( settings, list ) {
-                var note, id, el, n, h, a, author,
-                        action = false,
-                        wpListsData = $( settings.target ).attr( 'data-wp-lists' );
-
                 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 ( wpListsData.indexOf(':trash=1') != -1 )
-                        action = 'trash';
-                else if ( wpListsData.indexOf(':spam=1') != -1 )
-                        action = 'spam';
+                if (! $(settings.target).parent().hasClass('undo')) {
+                        showUndo(settings, list);
+                }
+
+                return settings;
+        }
+
+        showUndo = function( settings, list ) {
+                var note, id, el, n, h, a, author, undoAction, undoClass,
+                action = false,
+                wpListsData = $( settings.target ).attr( 'data-wp-lists' );
 
-                if ( action ) {
+
+                params = getActionFromClass( wpListsData );
+
+                if ( params ) {
                         id = wpListsData.replace(/.*?comment-([0-9]+).*/, '$1');
                         el = $('#comment-' + id);
-                        note = $('#' + action + '-undo-holder').html();
+                        note = $('#' + params.action + '-undo-holder').html();
 
                         el.find('.check-column :checkbox').prop('checked', false); // Uncheck the row so as not to be affected by Bulk Edits.
 
@@ -430 +468 @@
                         if ( el.is('tr') ) {
                                 n = el.children(':visible').length;
                                 author = $('.author strong', el).text();
-                                h = $('<tr id="undo-' + id + '" class="undo un' + action + '" style="display:none;"><td colspan="' + n + '">' + note + '</td></tr>');
+                                h = $('<tr id="undo-' + id + '" class="undo ' + params.undoAction + '" style="display:none;"><td colspan="' + n + '">' + note + '</td></tr>');
                         } else {
                                 author = $('.comment-author', el).text();
-                                h = $('<div id="undo-' + id + '" style="display:none;" class="undo un' + action + '">' + note + '</div>');
+                                h = $('<div id="undo-' + id + '" style="display:none;" class="undo ' + params.undoAction + '">' + note + '</div>');
                         }
 
                         el.before(h);
 
                         $('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('data-wp-lists', 'delete:the-comment-list:comment-' + id + '::un' + action + '=1');
+                        a.attr('href', 'comment.php?action=' + params.undoAction + 'comment&c=' + id + '&_wpnonce=' + settings.data._ajax_nonce);
+                        a.attr('data-wp-lists', 'delete:the-comment-list:comment-' + id + ':' + params.undoClass);
                         a.attr('class', 'vim-z vim-destructive aria-button-if-js');
-                        $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + action + '-undo-inside');
+                        $('.avatar', el).first().clone().prependTo('#undo-' + id + ' .' + params.action + '-undo-inside');
 
                         a.on( 'click', function( e ){
                                 e.preventDefault();
@@ -456 +494 @@
                         });
                 }
 
-                return settings;
         };
 
         /**
@@ -529 +566 @@
                                 } else if ( '0' === commentStatus ) {
                                         pendingDiff = 1;
                                 }
+
+                        // The comment was approved.
+                        } else if ( targetParent.hasClass( 'unapprove' ) ) {
+                                approvedDiff = -1;
+                                pendingDiff = 1;
+
+                        // The comment was unapproved.
+                        } else if ( targetParent.hasClass( 'approve' ) ) {
+                                approvedDiff = 1;
+                                pendingDiff = -1;
                         }
 
                         undoing = true;
@@ -765 +812 @@
                 .on('wpListDelEnd', function(e, s){
                         var wpListsData = $(s.target).attr('data-wp-lists'), id = s.element.replace(/[^0-9]+/g, '');
 
-                        if ( wpListsData.indexOf(':trash=1') != -1 || wpListsData.indexOf(':spam=1') != -1 )
+                        if ( getActionFromClass( wpListsData ) )
                                 $('#undo-' + id).fadeIn(300, function(){ $(this).show(); });
                 });
 };

src/wp-admin/css/dashboard.css

@@ -977 +977 @@
         width: 4px;
 }
 
-#activity-widget #the-comment-list .spam-undo-inside .avatar,
-#activity-widget #the-comment-list .trash-undo-inside .avatar {
+#activity-widget #the-comment-list .undo-inside .avatar {
         position: relative;
         top: 0;
 }

src/wp-admin/css/edit.css

@@ -1535 +1535 @@
         margin-left: 1em;
 }
 
-.trash-undo-inside,
-.spam-undo-inside {
+.undo-inside {
         margin: 1px 8px 1px 0;
         line-height: 1.23076923;
 }
 
-.spam-undo-inside .avatar,
-.trash-undo-inside .avatar {
+.undo-inside .avatar {
         height: 20px;
         width: 20px;
         margin-right: 8px;
         vertical-align: middle;
 }
 
+.undo-inside .approve {
+        display:inline;
+}
+
 .stuffbox .editcomment {
         clear: none;
         margin-top: 0;

src/wp-admin/includes/template.php

@@ -555 +555 @@
 function wp_comment_trashnotice() {
         ?>
 <div class="hidden" id="trash-undo-holder">
-        <div class="trash-undo-inside">
+        <div class="trash-undo-inside undo-inside">
                 <?php
                 /* translators: %s: Comment author, filled by Ajax. */
                 printf( __( 'Comment by %s moved to the Trash.' ), '<strong></strong>' );
@@ -564 +564 @@
         </div>
 </div>
 <div class="hidden" id="spam-undo-holder">
-        <div class="spam-undo-inside">
+        <div class="spam-undo-inside undo-inside">
                 <?php
                 /* translators: %s: Comment author, filled by Ajax. */
                 printf( __( 'Comment by %s marked as spam.' ), '<strong></strong>' );
                 ?>
                 <span class="undo unspam"><a href="#"><?php _e( 'Undo' ); ?></a></span>
         </div>
+</div>
+<div class="hidden" id="approve-undo-holder">
+        <div class="approve-undo-inside undo-inside">
+                <?php
+                /* translators: %s: Comment author, filled by Ajax. */
+                printf( __( 'Comment by %s approved.' ), '<strong></strong>' );
+                ?>
+                <span class="undo unapprove"><a href="#"><?php _e( 'Undo' ); ?></a></span>
+        </div>
+</div>
+<div class="hidden" id="unapprove-undo-holder">
+        <div class="unapprove-undo-inside undo-inside">
+                <?php
+                /* translators: %s: Comment author, filled by Ajax. */
+                printf( __( 'Comment by %s unapproved.' ), '<strong></strong>' );
+                ?>
+                <span class="undo approve"><a href="#"><?php _e( 'Undo' ); ?></a></span>
+        </div>
 </div>
         <?php
 }