Changeset 37302 for trunk

Timestamp:

04/22/2016 09:29:19 PM (10 years ago)

Author:

wonderboymusic

Message:

Dashboard: toggle the "View" link for comments when Approving / Unapproving from the Dashboard widget.

Fixes #35518.

Location:

trunk/src/wp-admin

Files:

• includes/dashboard.php (modified) (2 diffs)
• js/edit-comments.js (modified) (1 diff)

trunk/src/wp-admin/includes/dashboard.php

@@ -631 +631 @@
                 }
 
-                if ( '1' === $comment->comment_approved ) {
-                        $actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '" aria-label="' . esc_attr__( 'View this comment' ) . '">' . __( 'View' ) . '</a>';
-                }
+                $actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '" aria-label="' . esc_attr__( 'View this comment' ) . '">' . __( 'View' ) . '</a>';
 
                 /**
@@ -654 +652 @@
 
                         // Reply and quickedit need a hide-if-no-js span
-                        if ( 'reply' == $action || 'quickedit' == $action )
+                        if ( 'reply' == $action || 'quickedit' == $action ) {
                                 $action .= ' hide-if-no-js';
-
+                        }
+
+                        if ( 'view' === $action && '1' !== $comment->comment_approved ) {
+                                $action .= ' hidden';
+                        }
                         $actions_string .= "<span class='$action'>$sep$link</span>";
                 }

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

@@ -221 +221 @@
                                 replyButton.text(adminCommentsL10n.replyApprove);
 
-                        c.find('div.comment_status').html('0');
+                        c.find( '.row-actions span.view' ).addClass( 'hidden' ).end()
+                                .find( 'div.comment_status' ).html( '0' );
+
                 } else {
                         if ( settings.data.id == replyID )
                                 replyButton.text(adminCommentsL10n.reply);
 
-                        c.find('div.comment_status').html('1');
+                        c.find( '.row-actions span.view' ).removeClass( 'hidden' ).end()
+                                .find( 'div.comment_status' ).html( '1' );
                 }