Changeset 17322 for trunk/wp-admin/includes/class-wp-list-table.php

Timestamp:

01/16/2011 09:47:24 PM (14 years ago)

Author:

nacin

Message:

Remove AJAX from list tables. first pass. see #16262.

File:

• trunk/wp-admin/includes/class-wp-list-table.php (modified) (8 diffs)

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

@@ -14 +14 @@
  * @subpackage List_Table
  * @since 3.1.0
+ * @access private
  */
 class WP_List_Table {
@@ -93 +94 @@
         $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' ) );
+        // }
     }
 
@@ -200 +201 @@
     <label class="screen-reader-text" for="<?php echo $input_id ?>"><?php echo $text; ?>:</label>
     <input type="text" id="<?php echo $input_id ?>" name="s" value="<?php _admin_search_query(); ?>" />
-    <?php submit_button( $text, 'button', 'submit', false, array('id' => 'search-submit') ); ?>
+    <?php submit_button( $text, 'button', false, false, array('id' => 'search-submit') ); ?>
 </p>
-<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
 <?php
     }
@@ -468 +468 @@
      * @access protected
      */
-    function pagination() {
-        if ( $this->_pagination ) {
-            echo $this->_pagination;
-            return;
-        }
-
+    function pagination( $which ) {
         if ( empty( $this->_pagination_args ) )
             return;
@@ -507 +502 @@
         );
 
-        $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='%s' value='%s' size='%d' />",
-            esc_attr__( 'Current page' ),
-            esc_attr( 'paged' ),
-            number_format_i18n( $current ),
-            strlen( $total_pages )
-        );
+        if ( 'bottom' == $which )
+            $html_current_page = $current;
+        else
+            $html_current_page = sprintf( "<input class='current-page' title='%s' type='text' name='%s' value='%s' size='%d' />",
+                esc_attr__( 'Current page' ),
+                esc_attr( 'paged' ),
+                $current,
+                strlen( $total_pages )
+            );
+
         $html_total_pages = sprintf( "<span class='total-pages'>%s</span>", number_format_i18n( $total_pages ) );
         $page_links[] = '<span class="paging-input">' . sprintf( _x( '%1$s of %2$s', 'paging' ), $html_current_page, $html_total_pages ) . '</span>';
@@ -634 +633 @@
 
         $current_url = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
+        $current_url = remove_query_arg( 'paged', $current_url );
 
         if ( isset( $_GET['orderby'] ) )
@@ -693 +693 @@
         extract( $this->_args );
 
-        wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
-
         $this->display_tablenav( 'top' );
 
@@ -749 +747 @@
         $this->extra_tablenav( $which );
         $this->pagination( $which );
-
-if ( 'bottom' == $which ) {
 ?>
-<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-loading list-ajax-loading" alt="" />
-<?php } ?>
 
         <br class="clear" />