Ticket #16262: markjaquith.16262.issue09.river.3.diff

wp-includes/script-loader.php

@@ -299 +299 @@
                 $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' );
                 $scripts->add_data( 'admin-custom-fields', 'group', 1 );
 
-                $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags'), '20110121' );
+                $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'jquery-ui-resizable', 'quicktags', 'jquery-query'), '20110121' );
                 $scripts->add_data( 'admin-comments', 'group', 1 );
                 $scripts->localize( 'admin-comments', 'adminCommentsL10n', array(
                         'hotkeys_highlight_first' => isset($_GET['hotkeys_highlight_first']),

wp-admin/includes/class-wp-list-table.php

@@ -81 +81 @@
                 $args = wp_parse_args( $args, array(
                         'plural' => '',
                         'singular' => '',
-                        'ajax' => true
+                        'ajax' => false
                 ) );
 
                 $screen = get_current_screen();
@@ -93 +93 @@
 
                 $this->_args = $args;
 
-                // if ( $args['ajax'] ) {
-                //      wp_enqueue_script( 'list-table' );
-                //      add_action( 'admin_footer', array( &$this, '_js_vars' ) );
-                // }
+                if ( $args['ajax'] ) {
+                        // wp_enqueue_script( 'list-table' );
+                        add_action( 'admin_footer', array( &$this, '_js_vars' ) );
+                }
         }
 
         /**

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

@@ -32 +32 @@
                 parent::WP_List_Table( array(
                         'plural' => 'comments',
                         'singular' => 'comment',
+                        'ajax' => true,
                 ) );
         }
 
@@ -267 +268 @@
         function display() {
                 extract( $this->_args );
 
-                // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 
                 $this->display_tablenav( 'top' );
 
@@ -538 +539 @@
         function display( $output_empty = false ) {
                 extract( $this->_args );
 
-                // wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+                wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
 ?>
 <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0" style="display:none;">
         <tbody id="the-comment-list"<?php if ( $singular ) echo " class='list:$singular'"; ?>>

wp-admin/js/edit-comments.dev.js

@@ -211 +211 @@
 
                 theList.get(0).wpList.add( theExtraList.children(':eq(0)').remove().clone() );
 
-                // refillTheExtraList();
+                refillTheExtraList();
         };
 
-        /* var refillTheExtraList = function(ev) {
-                var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val();
-
+        var refillTheExtraList = function(ev) {
+                // var args = $.query.get(), total_pages = listTable.get_total_pages(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
+                var args = $.query.get(), total_pages = $('.total-pages').text(), per_page = $('input[name=_per_page]', '#comments-form').val(), r;
+                
+                if (! args.paged)
+                        args.paged = 1;
+                
                 if (args.paged > total_pages) {
                         return;
                 }
@@ -226 +230 @@
                         args.number = Math.min(8, per_page); // see WP_Comments_List_Table::prepare_items() @ class-wp-comments-list-table.php
                 } else {
                         args.number = 1;
-                        args.offset = per_page - 1; // fetch only the last item of the next page
+                        args.offset = Math.min(8, per_page) - 1; // fetch only the next item on the extra list
                 }
 
                 args.no_placeholder = true;
 
                 args.paged ++;
+                
+                args = $.extend(args, {
+                        'action': 'fetch-list',
+                        'list_args': list_args,
+                        '_ajax_fetch_list_nonce': $('#_ajax_fetch_list_nonce').val()
+                });
 
-                listTable.fetch_list(args, function(response) {
-                        theExtraList.get(0).wpList.add( response.rows );
+                $.ajax({
+                        url: ajaxurl,
+                        global: false,
+                        dataType: 'json',
+                        data: args,
+                        success: function(response) {
+                                theExtraList.get(0).wpList.add( response.rows );
+                        }
                 });
-        }; */
+        };
 
         theExtraList = $('#the-extra-comment-list').wpList( { alt: '', delColor: 'none', addColor: 'none' } );
         theList = $('#the-comment-list').wpList( { alt: '', delBefore: delBefore, dimAfter: dimAfter, delAfter: delAfter, addColor: 'none' } )