Changeset 14107

Timestamp:

04/16/2010 02:03:48 PM (14 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:

• edit-form-advanced.php (modified) (1 diff)
• post-new.php (modified) (4 diffs)
• post.php (modified) (2 diffs)

trunk/wp-admin/edit-form-advanced.php

@@ -10 +10 @@
 if ( !defined('ABSPATH') )
     die('-1');
+
+wp_enqueue_script('post');
+
+if ( post_type_supports($post_type, 'editor') ) {
+    if ( user_can_richedit() )
+        wp_enqueue_script('editor');
+    wp_enqueue_script('word-count');
+}
+
+if ( post_type_supports($post_type, 'editor') || post_type_supports($post_type, 'thumbnail') ) {
+    add_thickbox();
+    wp_enqueue_script('media-upload');
+}
 
 /**

trunk/wp-admin/post-new.php

@@ -8 +8 @@
 
 /** Load WordPress Administration Bootstrap */
-require_once('admin.php');
+require_once('./admin.php');
 
 if ( !isset($_GET['post_type']) )
@@ -30 +30 @@
 
 $editing = true;
-wp_enqueue_script('autosave');
-wp_enqueue_script('post');
-if ( user_can_richedit() )
-    wp_enqueue_script('editor');
-add_thickbox();
-wp_enqueue_script('media-upload');
-wp_enqueue_script('word-count');
 
 if ( 'post' == $post_type && !current_user_can('edit_posts') ) {
-    require_once ('./admin-header.php'); ?>
+    include('./admin-header.php'); ?>
 <div class="wrap">
 <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 />
@@ -47 +40 @@
 </div>
 <?php
-    include('admin-footer.php');
+    include('./admin-footer.php');
     exit();
 }
+
+wp_enqueue_script('autosave');
 
 // Show post form.
@@ -58 +53 @@
 }
 
-include('admin-footer.php');
+include('./admin-footer.php');
 ?>

trunk/wp-admin/post.php

@@ -171 +171 @@
     }
 
-    wp_enqueue_script('post');
-    if ( user_can_richedit() )
-        wp_enqueue_script('editor');
-    add_thickbox();
-    wp_enqueue_script('media-upload');
-    wp_enqueue_script('word-count');
-    wp_enqueue_script( 'admin-comments' );
-    enqueue_comment_hotkeys_js();
-
     if ( $last = wp_check_post_lock( $post->ID ) ) {
         add_action('admin_notices', '_admin_notice_post_locked' );
@@ -189 +180 @@
     $title = sprintf(__('Edit %s'), $post_type_object->singular_label);
     $post = get_post_to_edit($post_id);
+
+    if ( post_type_supports($post_type, 'comments') ) {
+        wp_enqueue_script('admin-comments');
+        enqueue_comment_hotkeys_js();
+    }
 
     include('edit-form-advanced.php');