WordPress.org
Get WordPress

Make WordPress Core

Changeset 7057


Ignore:
Timestamp:
02/27/2008 12:46:27 AM (17 years ago)
Author:
ryan
Message:

Don't load wp-lists on pages that don't need it. Props mdawaffe. fixes #6011

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/edit-comments.php

    r7050 r7057  
    180180        $authordata = get_userdata($post->post_author);
    181181        $the_comment_status = wp_get_comment_status($comment->comment_ID);
    182         $class = ('alternate' == $class) ? '' : '';
    183         $class .= ('unapproved' == $the_comment_status) ? ' unapproved' : '';
     182        $class = ('unapproved' == $the_comment_status) ? 'unapproved' : '';
    184183        $post_link = '<a href="' . get_comment_link() . '">' . get_the_title($comment->comment_post_ID) . '</a>';
    185184        $author_url = get_comment_author_url();

  • trunk/wp-admin/edit-pages.php

    r7047 r7057  
    3434$title = __('Pages');
    3535$parent_file = 'edit.php';
    36 wp_enqueue_script( 'wp-lists' );
    3736wp_enqueue_script('admin-forms');
    3837require_once('admin-header.php');
    … …  
    140139  </tr>
    141140  </thead>
    142   <tbody id="the-list" class="list:page">
     141  <tbody>
    143142  <?php page_rows($posts); ?>
    144143  </tbody>

  • trunk/wp-admin/edit-post-rows.php

    r7050 r7057  
    1111    </tr>
    1212    </thead>
    13     <tbody id="the-list" class="list:post">
     13    <tbody>
    1414<?php
    1515$i_post = 0;
    … …  
    1818add_filter('the_title','wp_specialchars');
    1919while (have_posts()) : the_post(); $i_post++;
    20 if ( 16 == $i_post )
    21     echo "\t</tbody>\n\t<tbody id='the-extra-list' class='list:post' style='display: none'>\n"; // Hack!
    2220$class = ( $i_post > 15 || 'alternate' == $class) ? '' : 'alternate';
    2321global $current_user;
    … …  
    166164    case 'control_delete':
    167165        ?>
    168         <td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete:the-list:post-$post->ID delete'>" . __('Delete') . "</a>"; } ?></td>
     166        <td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&amp;post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td>
    169167        <?php
    170168        break;

  • trunk/wp-admin/edit.php

    r7046 r7057  
    3434$title = __('Posts');
    3535$parent_file = 'edit.php';
    36 wp_enqueue_script( 'admin-posts' );
    3736wp_enqueue_script('admin-forms');
    3837if ( 1 == $_GET['c'] )
    … …  
    4039require_once('admin-header.php');
    4140
    42 add_filter( 'post_limits', $limit_filter = create_function( '$a', '$b = split(" ",$a); if ( !isset($b[2]) ) return $a; $start = intval(trim($b[1])) / 20 * 15; if ( !is_int($start) ) return $a; return "LIMIT $start, 20";' ) );
    4341list($post_stati, $avail_post_stati) = wp_edit_posts_query();
    44 $wp_query->max_num_pages = ceil( $wp_query->found_posts / 15 ); // We grab 20 but only show 15 ( 5 more for ajax extra )
    4542
    4643if ( !isset( $_GET['paged'] ) )
    … …  
    180177</form>
    181178
    182 <form action="" method="post" id="get-extra-posts" class="add:the-extra-list:" style="display:none">
    183     <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?>
    184 </form>
    185 
    186179<div id="ajax-response"></div>
    187180

  • trunk/wp-admin/includes/template.php

    r7050 r7057  
    264264    $out = '';
    265265    $class = '';
    266     $i = 0;
    267266    $count = 0;
    268     foreach( $tags as $tag ) {
    269         if( $i ) {
    270             $i = 0;
    271             $class = ' class="alternate"';
    272         } else {
    273             $i = 1;
    274             $class = '';
    275         }
    276 
    277         $out .= _tag_row( $tag, $class );
    278         $count++;
    279     }
     267    foreach( $tags as $tag )
     268        $out .= _tag_row( $tag, ++$count % 2 ? ' class="alternate"' : '' );
    280269
    281270    // filter and send to screen

  • trunk/wp-admin/js/edit-posts.js

    r6287 r7057  
    1 jQuery(function($) {
    2 var delAfter; var extra; var list;
    3 
    4 if ( document.location.href.match(/(\?|&)c=/) )
    5     delAfter = function() { $('#comments, #the-comment-list').remove(); }
    6 else
    7     delAfter = function() {
    8         list[0].wpList.add( extra.children(':eq(0)').remove().clone() );
    9         $('#get-extra-posts').submit();
    10     }
    11 
    12 var addBefore = function ( settings ) {
    13     var q = document.location.href.split('?');
    14     if ( q[1] )
    15         settings.data += '&' + q[1];
    16     return settings;
    17 }
    18 
    19 extra = $('#the-extra-list').wpList( { alt: '', addBefore: addBefore, addColor: 'none', delColor: 'none' } );
    20 list = $('#the-list').wpList( { delAfter: delAfter, addColor: 'none' } );
    21 
    22 } );

  • trunk/wp-admin/js/users.js

    r6213 r7057  
    1 jQuery( function($) {
    2     var userLists; var list; var addBefore; var addAfter;
    3 
    4     addBefore = function( s ) {
    5         if ( $( '#role-' + $('#role').val() ).size() )
    6             return s;
    7         return false;
    8     };
    9 
    10     addAfter = function( r, s ) {
    11         var roleTable = $( '#role-' + $('role', r).text() );
    12 
    13         var e = $('#user-' + $('user', r).attr('id') );
    14         if ( !roleTable.size() ) { return; }
    15         if ( !e.size() ) { return; }
    16 
    17         roleTable[0].wpList.add(e.remove().clone());
    18     }; 
    19 
    20     userLists = $('.user-list').wpList();
    21     list = $('#user-list').wpList( { addBefore: addBefore, addAfter: addAfter } );
    22 } );
     1jQuery( function($) { $('#users').wpList(); } );

  • trunk/wp-admin/link-manager.php

    r7046 r7057  
    2525}
    2626
    27 wp_enqueue_script( 'wp-lists' );
    2827wp_enqueue_script('admin-forms');
    2928
    … …  
    151150    </tr>
    152151    </thead>
    153     <tbody id="the-list" class="list:link">
     152    <tbody>
    154153<?php
    155154    foreach ($links as $link) {

  • trunk/wp-admin/upload.php

    r7046 r7057  
    3232$title = __('Media Library');
    3333$parent_file = 'edit.php';
    34 wp_enqueue_script( 'admin-posts' );
    3534wp_enqueue_script( 'admin-forms' );
    3635if ( 1 == $_GET['c'] )
    … …  
    182181</form>
    183182
    184 <form action="" method="post" id="get-extra-posts" class="add:the-extra-list:" style="display:none">
    185     <?php wp_nonce_field( 'add-post', '_ajax_nonce', false ); ?>
    186 </form>
    187 
    188183<div id="ajax-response"></div>
    189184

  • trunk/wp-admin/users.php

    r7000 r7057  
    265265unset($users_of_blog);
    266266
     267$current_role = false;
    267268foreach ( $wp_roles->get_names() as $role => $name ) {
    268269    if ( !isset($avail_roles[$role]) )
    … …  
    271272    $class = '';
    272273
    273     if ( $role == $_GET['role'] )
     274    if ( $role == $_GET['role'] ) {
     275        $current_role = $_GET['role'];
    274276        $class = ' class="current"';
     277    }
    275278
    276279    $name = translate_with_context($name);
    … …  
    340343<tbody id="users" class="list:user user-list">
    341344<?php
     345$style = '';
    342346foreach ( $wp_user_search->get_results() as $userid ) {
    343347    $user_object = new WP_User($userid);
    … …  
    345349    $role = array_shift($roles);
    346350
    347     $style = '';
    348351    $style = ( ' class="alternate"' == $style ) ? '' : ' class="alternate"';
    349352    echo "\n\t" . user_row($user_object, $style, $role);
    … …  
    400403            echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), get_option('siteurl').'/wp-admin/options-general.php#users_can_register') . '</p>';
    401404?>
    402 <form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:user-list:">
     405<form action="#add-new-user" method="post" name="adduser" id="adduser" class="add:users:">
    403406<?php wp_nonce_field('add-user') ?>
    404407<table class="form-table">
    … …  
    438441            <?php
    439442            if ( !$new_user_role )
    440                 $new_user_role = get_option('default_role');
     443                $new_user_role = $current_role ? $current_role : get_option('default_role');
    441444            wp_dropdown_roles($new_user_role);
    442445            ?>
    … …  
    451454</form>
    452455
    453 <table style="color:red">
    454 <tbody id="user-list" class="list:user">
    455 </tbody>
    456 </table>
    457 
    458456</div>
    459457

  • trunk/wp-includes/script-loader.php

    r7053 r7057  
    127127            ) );
    128128            $this->add( 'admin-comments', '/wp-admin/js/edit-comments.js', array('wp-lists'), '20071104' );
    129             $this->add( 'admin-posts', '/wp-admin/js/edit-posts.js', array('wp-lists'), '20071023' );
    130129            $this->add( 'admin-users', '/wp-admin/js/users.js', array('wp-lists'), '20070823' );
    131             $this->add( 'admin-forms', '/wp-admin/js/forms.js', array('wp-lists'), '20080108' );
     130            $this->add( 'admin-forms', '/wp-admin/js/forms.js', false, '20080108' );
    132131            $this->add( 'xfn', '/wp-admin/js/xfn.js', false, '3517' );
    133132            $this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
Note: See TracChangeset for help on using the changeset viewer.