Changeset 33657

Timestamp:

08/20/2015 05:53:41 AM (11 years ago)

Author:

wonderboymusic

Message:

Comments List Table:

• In a view that initially has comments, but they get removed due to user actions: show the No Items row instead of bombing out and showing nothing (which looks broken)
• To accomplish this, in WP_Comments_List_Table::display(): call ->display_rows_or_placeholder() instead of ->display()
• Listen for the end of row .fadeOut()s if necessary using jQuery Promises

Fixes #11200.

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-comments-list-table.php (modified) (1 diff)
• js/edit-comments.js (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-comments-list-table.php

@@ -410 +410 @@
 
         <tbody id="the-extra-comment-list" data-wp-lists="list:comment" style="display: none;">
-                <?php $this->items = $this->extra_items; $this->display_rows(); ?>
+                <?php
+                        $this->items = $this->extra_items;
+                        $this->display_rows_or_placeholder(); 
+                ?>
         </tbody>
 

trunk/src/wp-admin/js/edit-comments.js

@@ -153 +153 @@
         // In admin-ajax.php, we send back the unix time stamp instead of 1 on success
         delAfter = function( r, settings ) {
-                var total_items_i18n, total,
+                var total_items_i18n, total, animated, animatedCallback,
                         response = true === settings.parsed ? {} : settings.parsed.responses[0],
                         commentStatus = true === settings.parsed ? '' : response.supplemental.status,
@@ -334 +334 @@
                 }
 
-                theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
+                theList.get(0).wpList.add( theExtraList.children( ':eq(0):not(.no-items)' ).remove().clone() );
 
                 refillTheExtraList();
+
+                animated = $( ':animated' );
+                animatedCallback = function () {
+                        if ( ! $( '#the-comment-list tr:visible' ).length ) {
+                                theList.get(0).wpList.add( theExtraList.find( '.no-items' ).clone() );
+                        }
+                };
+
+                if ( animated.length ) {
+                        animated.promise().done( animatedCallback );
+                } else {
+                        animatedCallback();
+                }
         };