vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-03-31 10:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@18799 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2011-09-28 07:26:34 +00:00
parent 2a7b8b4764
commit 13c72ba193
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
wp-includes/class-wp-editor.php
View File

@@ -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 @@ class WP_Editor {
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 @@ class WP_Editor {
$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 @@ class WP_Editor {
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 @@ class WP_Editor {
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 @@ class WP_Editor {
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 @@ class WP_Editor {
}
}