Ticket #40001: 40001.diff

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

@@ +1 @@
+<?php
+/**
+ * List Table API: WP_Comments_List_Table class
+ *
+ * @package WordPress
+ * @subpackage Administration
+ * @since 3.1.0
+ */
+
+/**
+ * Core class used to implement displaying comments in a list table.
+ *
+ * @since 3.1.0
+ * @access private
+ *
+ * @see WP_List_Table
+ */
+class WP_Comments_Reactive_List_Table extends WP_Comments_List_Table {
+        // Because it's private in WP_Comments_List_Table...
+        protected $user_can;
+
+        public function get_column_data() {
+                list( $columns ) = $this->get_column_info();
+                $data = array();
+                foreach ( $columns as $key => $name ) {
+                        $data[] = compact( 'key', 'name' );
+                }
+                return $data;
+        }
+
+        /**
+         * @global WP_Post    $post
+         * @global WP_Comment $comment
+         *
+         * @param WP_Comment $item
+         */
+        public function single_row( $item ) {
+                // return;
+                global $post, $comment;
+
+                $comment = $item;
+
+                $the_comment_class = wp_get_comment_status( $comment );
+                if ( ! $the_comment_class ) {
+                        $the_comment_class = '';
+                }
+                $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) );
+
+                if ( $comment->comment_post_ID > 0 ) {
+                        $post = get_post( $comment->comment_post_ID );
+                }
+                $this->user_can = current_user_can( 'edit_comment', $comment->comment_ID );
+
+                echo "<tr id='comment-$comment->comment_ID' class='$the_comment_class' data-comment-id='{$comment->comment_ID}'>";
+                $this->single_row_columns( $comment );
+                echo "</tr>\n";
+
+                unset( $GLOBALS['post'], $GLOBALS['comment'] );
+        }
+
+        /**
+         * @access public
+         */
+        public function display() {
+                $this->display_tablenav( 'top' );
+
+                $this->screen->render_screen_reader_content( 'heading_list' );
+
+?>
+<table class="wp-list-table <?php echo implode( ' ', $this->get_table_classes() ); ?>">
+        <thead>
+        <tr>
+                <?php $this->print_column_headers(); ?>
+        </tr>
+        </thead>
+
+        <tbody id="the-comment-list">
+                <?php //$this->display_rows_or_placeholder(); ?>
+        </tbody>
+
+        <tbody id="the-extra-comment-list" style="display: none;">
+                <?php
+                        // $this->items = $this->extra_items;
+                        // $this->display_rows_or_placeholder();
+                ?>
+        </tbody>
+
+        <tfoot>
+        <tr>
+                <?php $this->print_column_headers( false ); ?>
+        </tr>
+        </tfoot>
+
+</table>
+<?php
+
+                $this->display_tablenav( 'bottom' );
+        }
+
+        protected function get_row_actions( $comment ) {
+                global $comment_status;
+
+                $the_comment_status = wp_get_comment_status( $comment );
+
+                $del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
+                $approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
+
+                $url = "comment.php?c=$comment->comment_ID";
+
+                $approve_url = esc_url( $url . "&action=approvecomment&$approve_nonce" );
+                $unapprove_url = esc_url( $url . "&action=unapprovecomment&$approve_nonce" );
+                $spam_url = esc_url( $url . "&action=spamcomment&$del_nonce" );
+                $unspam_url = esc_url( $url . "&action=unspamcomment&$del_nonce" );
+                $trash_url = esc_url( $url . "&action=trashcomment&$del_nonce" );
+                $untrash_url = esc_url( $url . "&action=untrashcomment&$del_nonce" );
+                $delete_url = esc_url( $url . "&action=deletecomment&$del_nonce" );
+
+                // Preorder it: Approve | Reply | Quick Edit | Edit | Spam | Trash.
+                $actions = array(
+                        'approve' => '', 'unapprove' => '',
+                        'reply' => '',
+                        'quickedit' => '',
+                        'edit' => '',
+                        'spam' => '', 'unspam' => '',
+                        'trash' => '', 'untrash' => '', 'delete' => ''
+                );
+
+                // Not looking at all comments.
+                if ( $comment_status && 'all' != $comment_status ) {
+                        if ( 'approved' === $the_comment_status ) {
+                                //  data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=unapproved'
+                                $actions['unapprove'] = "<a href='$unapprove_url' class='vim-u vim-destructive' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+                        } elseif ( 'unapproved' === $the_comment_status ) {
+                                // data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:e7e7d3:action=dim-comment&amp;new=approved'
+                                $actions['approve'] = "<a href='$approve_url' class='vim-a vim-destructive' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+                        }
+                } else {
+                        // data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved'
+                        $actions['approve'] = "<a href='$approve_url' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
+                        // data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved'
+                        $actions['unapprove'] = "<a href='$unapprove_url' class='vim-u' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
+                }
+
+                if ( 'spam' !== $the_comment_status ) {
+                        //  data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive'
+                        $actions['spam'] = "<a href='$spam_url' aria-label='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+                } elseif ( 'spam' === $the_comment_status ) {
+                        //  data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:unspam=1' 
+                        $actions['unspam'] = "<a href='$unspam_url'class='vim-z vim-destructive' aria-label='" . esc_attr__( 'Restore this comment from the spam' ) . "'>" . _x( 'Not Spam', 'comment' ) . '</a>';
+                }
+
+                if ( 'trash' === $the_comment_status ) {
+                        //  data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID:66cc66:untrash=1'
+                        $actions['untrash'] = "<a href='$untrash_url' class='vim-z vim-destructive' aria-label='" . esc_attr__( 'Restore this comment from the Trash' ) . "'>" . __( 'Restore' ) . '</a>';
+                }
+
+                if ( 'spam' === $the_comment_status || 'trash' === $the_comment_status || !EMPTY_TRASH_DAYS ) {
+                        // data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::delete=1' class='delete vim-d vim-destructive'
+                        $actions['delete'] = "<a href='$delete_url' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( 'Delete Permanently' ) . '</a>';
+                } else {
+                        // data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' 
+                        $actions['trash'] = "<a href='$trash_url' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
+                }
+
+                if ( 'spam' !== $the_comment_status && 'trash' !== $the_comment_status ) {
+                        $actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>". __( 'Edit' ) . '</a>';
+
+                        $format = '<a data-comment-id="%d" data-post-id="%d" data-action="%s" class="%s" aria-label="%s" href="#">%s</a>';
+
+                        $actions['quickedit'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'edit', 'vim-q comment-inline', esc_attr__( 'Quick edit this comment inline' ), __( 'Quick&nbsp;Edit' ) );
+
+                        $actions['reply'] = sprintf( $format, $comment->comment_ID, $comment->comment_post_ID, 'replyto', 'vim-r comment-inline', esc_attr__( 'Reply to this comment' ), __( 'Reply' ) );
+                }
+
+                /** This filter is documented in wp-admin/includes/dashboard.php */
+                $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
+
+                return $actions;
+        }
+
+        /**
+         * Generate and display row actions links.
+         *
+         * @since 4.3.0
+         * @access protected
+         *
+         * @global string $comment_status Status for the current listed comments.
+         *
+         * @param WP_Comment $comment     The comment object.
+         * @param string     $column_name Current column name.
+         * @param string     $primary     Primary column name.
+         * @return string|void Comment row actions output.
+         */
+        protected function handle_row_actions( $comment, $column_name, $primary ) {
+                global $comment_status;
+
+                if ( $primary !== $column_name ) {
+                        return '';
+                }
+
+                if ( ! $this->user_can ) {
+                        return;
+                }
+
+                $the_comment_status = wp_get_comment_status( $comment );
+
+                $out = '';
+
+
+                $actions = $this->get_row_actions( $comment );
+
+                $i = 0;
+                $out .= '<div class="row-actions">';
+                foreach ( $actions as $action => $link ) {
+                        ++$i;
+                        ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+
+                        // Reply and quickedit need a hide-if-no-js span when not added with ajax
+                        if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() )
+                                $action .= ' hide-if-no-js';
+                        elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
+                                if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) )
+                                        $action .= ' approve';
+                                else
+                                        $action .= ' unapprove';
+                        }
+
+                        $out .= "<span class='$action'>$sep$link</span>";
+                }
+                $out .= '</div>';
+
+                $out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
+
+                return $out;
+        }
+}

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

@@ +1 @@
+jQuery(function ($) {
+        var $table = $( '#the-comment-list' );
+        if ( $table.length < 1 ) {
+                return;
+        }
+
+        var currentComment = function ( $element ) {
+                // Search upwards for the row.
+                var $row = $element.closest( 'tr' );
+                return $row.data( 'comment-id' );
+        };
+
+        var handleAction = function ( callback ) {
+                return function ( e ) {
+                        e.preventDefault();
+
+                        // Search upwards for the row, and use the ID.
+                        var $row = $( this ).closest( 'tr' );
+                        var id = $row.data( 'comment-id' );
+
+                        // Grab the comment object.
+                        var comment = new wp.api.models.Comment({ id: id });
+
+                        callback( comment, $row );
+                };
+        };
+
+        var actionMap = {
+                '.unapprove a': function ( comment, $row ) {
+                        comment.save({ status: 'hold' }, {
+                                success: function () {
+                                        $row.removeClass('approved').addClass('unapproved');
+                                }
+                        });
+                },
+                '.approve a': function ( comment, $row ) {
+                        comment.save({ status: 'approve' }, {
+                                success: function () {
+                                        $row.removeClass('unapproved').addClass('approved');
+                                }
+                        });
+                },
+                '.spam a': function ( comment, $row ) {
+                        comment.save({ status: 'spam' }, {
+                                success: function () {
+                                        // $row
+                                }
+                        });
+                },
+                '.untrash a': function ( comment, $row ) {
+                        // comment.save({ status: })
+                },
+                '.trash a': function ( comment, $row ) {
+                        comment.destroy();
+                },
+                '.delete a': function ( comment, $row ) {
+                        comment.destroy();
+                },
+        };
+
+        var action, callback;
+        for ( action in actionMap ) {
+                if ( ! actionMap.hasOwnProperty( action ) ) {
+                        continue;
+                }
+
+                callback = actionMap[ action ];
+                $table.on( 'click', '.row-actions > ' + action, handleAction( callback ) );
+        }
+});