WordPress.org

Make WordPress Core

Changeset 14107


Ignore:
Timestamp:
04/16/10 14:03:48 (5 years ago)
Author:
nacin
Message:

Don't enqueue unnecessary scripts when the post type doesn't support the editor. fixes #12590, props scribu, _duck.

Location:
trunk/wp-admin
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/edit-form-advanced.php

    r14106 r14107  
    1010if ( !defined('ABSPATH') ) 
    1111    die('-1'); 
     12 
     13wp_enqueue_script('post'); 
     14 
     15if ( post_type_supports($post_type, 'editor') ) { 
     16    if ( user_can_richedit() ) 
     17        wp_enqueue_script('editor'); 
     18    wp_enqueue_script('word-count'); 
     19} 
     20 
     21if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) { 
     22    add_thickbox(); 
     23    wp_enqueue_script('media-upload'); 
     24} 
    1225 
    1326/** 
  • trunk/wp-admin/post-new.php

    r13537 r14107  
    88 
    99/** Load WordPress Administration Bootstrap */ 
    10 require_once('admin.php'); 
     10require_once('./admin.php'); 
    1111 
    1212if ( !isset($_GET['post_type']) ) 
     
    3030 
    3131$editing = true; 
    32 wp_enqueue_script('autosave'); 
    33 wp_enqueue_script('post'); 
    34 if ( user_can_richedit() ) 
    35     wp_enqueue_script('editor'); 
    36 add_thickbox(); 
    37 wp_enqueue_script('media-upload'); 
    38 wp_enqueue_script('word-count'); 
    3932 
    4033if ( 'post' == $post_type && !current_user_can('edit_posts') ) { 
    41     require_once ('./admin-header.php'); ?> 
     34    include('./admin-header.php'); ?> 
    4235<div class="wrap"> 
    4336<p><?php printf(__('Since you&#8217;re a newcomer, you&#8217;ll have to wait for an admin to add the <code>edit_posts</code> capability to your user, in order to be authorized to post.<br /> 
     
    4740</div> 
    4841<?php 
    49     include('admin-footer.php'); 
     42    include('./admin-footer.php'); 
    5043    exit(); 
    5144} 
     45 
     46wp_enqueue_script('autosave'); 
    5247 
    5348// Show post form. 
     
    5853} 
    5954 
    60 include('admin-footer.php'); 
     55include('./admin-footer.php'); 
    6156?> 
  • trunk/wp-admin/post.php

    r13242 r14107  
    171171    } 
    172172 
    173     wp_enqueue_script('post'); 
    174     if ( user_can_richedit() ) 
    175         wp_enqueue_script('editor'); 
    176     add_thickbox(); 
    177     wp_enqueue_script('media-upload'); 
    178     wp_enqueue_script('word-count'); 
    179     wp_enqueue_script( 'admin-comments' ); 
    180     enqueue_comment_hotkeys_js(); 
    181  
    182173    if ( $last = wp_check_post_lock( $post->ID ) ) { 
    183174        add_action('admin_notices', '_admin_notice_post_locked' ); 
     
    189180    $title = sprintf(__('Edit %s'), $post_type_object->singular_label); 
    190181    $post = get_post_to_edit($post_id); 
     182 
     183    if ( post_type_supports($post_type, 'comments') ) { 
     184        wp_enqueue_script('admin-comments'); 
     185        enqueue_comment_hotkeys_js(); 
     186    } 
    191187 
    192188    include('edit-form-advanced.php'); 
Note: See TracChangeset for help on using the changeset viewer.