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

azaozz · azaozz · commit 13c72ba193e5 · 2011-09-28T07:26:34.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@18799 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-admin/js/media-upload.dev.js b/wp-admin/js/media-upload.dev.js
@@ -12,10 +12,12 @@ function send_to_editor(h) {
 		} else if ( !qt ) {
 			return false;
 		}
-	} 
-
-	if ( !ed && mce && wpActiveEditor )
-		ed = tinymce.get(wpActiveEditor);
+	} else {
+		if ( mce && tinymce.activeEditor && (tinymce.activeEditor.id == 'mce_fullscreen' || tinymce.activeEditor.id == 'wp_mce_fullscreen') )
+			ed = tinymce.activeEditor;
+		else
+			ed = tinymce.get(wpActiveEditor);
+	}
 
 	if ( ed && !ed.isHidden() ) {
 		// restore caret position on IE
diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js
diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php
@@ -25,6 +25,9 @@ class WP_Editor {
 	var $first_init;
 	var $this_tinymce = false;
 	var $this_quicktags = false;
+	var $has_tinymce = false;
+	var $has_quicktags = false;
+	var $has_medialib = false;
 
 	function __construct() {
 		$this->can_richedit = user_can_richedit();
@@ -67,6 +70,7 @@ function editor( $content, $editor_id, $settings = array() ) {
 
 		if ( $this->this_quicktags && $this->this_tinymce ) {
 			$switch_class = 'html-active';
+			$this->has_tinymce = $this->has_quicktags = true;
 
 			if ( 'html' == $this->default_editor ) {
 				add_filter('the_editor_content', 'wp_htmledit_pre');
@@ -77,6 +81,12 @@ function editor( $content, $editor_id, $settings = array() ) {
 
 			$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;
 		}
 
 		echo '<div id="wp-' . $editor_id . '-wrap" class="wp-editor-wrap ' . $switch_class . '">';
@@ -89,6 +99,8 @@ function editor( $content, $editor_id, $settings = array() ) {
 			echo $buttons;
 
 			if ( $set['media_buttons'] ) {
+				$this->has_medialib = true;
+
 				if ( !function_exists('media_buttons') )
 					include(ABSPATH . 'wp-admin/includes/media.php');
 
@@ -442,10 +454,10 @@ function enqueue_scripts() {
 		wp_enqueue_script('word-count');
 		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');
 
 		if ( in_array('wplink', $this->plugins, true) || in_array('link', $this->qt_buttons, true) ) {
@@ -457,8 +469,10 @@ function enqueue_scripts() {
 		if ( in_array('wpfullscreen', $this->plugins, true) || in_array('fullscreen', $this->qt_buttons, true) )
 			wp_enqueue_script('wp-fullscreen');
 
-		add_thickbox();
-		wp_enqueue_script('media-upload');
+		if ( $this->has_medialib ) {
+			add_thickbox();
+			wp_enqueue_script('media-upload');
+		}
 	}
 
 	function editor_js() {
@@ -800,4 +814,3 @@ function wp_link_dialog() {
 	}
 }
 
-
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
@@ -276,7 +276,7 @@ function wp_default_scripts( &$scripts ) {
 
 	$scripts->add( 'word-count', "/wp-admin/js/word-count$suffix.js", array( 'jquery' ), '20110515', 1 );
 
-	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20110922', 1 );
+	$scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20110927', 1 );
 
 	if ( is_admin() ) {
 		$scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
