Changeset 18799 for trunk/wp-includes/class-wp-editor.php

Timestamp:

09/28/2011 07:26:34 AM (14 years ago)

Author:

azaozz

Message:

Fix enqueueing of the right scripts when more than one instance of the editor, fix inserting images in full screen mode, see #17144

File:

• trunk/wp-includes/class-wp-editor.php (modified) (7 diffs)

trunk/wp-includes/class-wp-editor.php

@@ -26 +26 @@
     var $this_tinymce = false;
     var $this_quicktags = false;
+    var $has_tinymce = false;
+    var $has_quicktags = false;
+    var $has_medialib = false;
 
     function __construct() {
@@ -68 +71 @@
         if ( $this->this_quicktags && $this->this_tinymce ) {
             $switch_class = 'html-active';
+            $this->has_tinymce = $this->has_quicktags = true;
 
             if ( 'html' == $this->default_editor ) {
@@ -78 +82 @@
             $buttons .= '<a id="' . $editor_id . '-html" class="hide-if-no-js wp-switch-editor switch-html" onclick="switchEditors.go(this);return false;">' . __('HTML') . "</a>\n";
             $buttons .= '<a id="' . $editor_id . '-tmce" class="hide-if-no-js wp-switch-editor switch-tmce" onclick="switchEditors.go(this);return false;">' . __('Visual') . "</a>\n";
+        } else {
+            if ( $this->this_tinymce )
+                $this->has_tinymce = true;
+
+            if ( $this->this_quicktags )
+                $this->has_quicktags = true;
         }
 
@@ -90 +100 @@
 
             if ( $set['media_buttons'] ) {
+                $this->has_medialib = true;
+
                 if ( !function_exists('media_buttons') )
                     include(ABSPATH . 'wp-admin/includes/media.php');
@@ -443 +455 @@
         wp_enqueue_style('editor-buttons');
 
-        if ( $this->this_tinymce )
+        if ( $this->has_tinymce )
             wp_enqueue_script('editor');
 
-        if ( $this->this_quicktags )
+        if ( $this->has_quicktags )
             wp_enqueue_script('quicktags');
 
@@ -458 +470 @@
             wp_enqueue_script('wp-fullscreen');
 
-        add_thickbox();
-        wp_enqueue_script('media-upload');
+        if ( $this->has_medialib ) {
+            add_thickbox();
+            wp_enqueue_script('media-upload');
+        }
     }
 
@@ -801 +815 @@
 }
 
-