Changeset 18799

Timestamp:

09/28/2011 07:26:34 AM (13 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

Location:

trunk

Files:

• wp-admin/js/media-upload.dev.js (modified) (1 diff)
• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-includes/class-wp-editor.php (modified) (7 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/js/media-upload.dev.js

@@ -13 +13 @@
             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() ) {

trunk/wp-admin/js/media-upload.js

@@ -1 @@
-var wpActiveEditor;function send_to_editor(c){var b,a=typeof(tinymce)!="undefined",f=typeof(QTags)!="undefined";if(!wpActiveEditor){if(a&&tinymce.activeEditor){b=tinymce.activeEditor;wpActiveEditor=b.id}else{if(!f){return false}}}if(!b&&a&&wpActiveEditor){b=tinymce.get(wpActiveEditor)}if(b&&!b.isHidden()){if(tinymce.isIE&&b.windowManager.insertimagebookmark){b.selection.moveToBookmark(b.windowManager.insertimagebookmark)}if(c.indexOf("[caption")===0){if(b.plugins.wpeditimage){c=b.plugins.wpeditimage._do_shcode(c)}}else{if(c.indexOf("[gallery")===0){if(b.plugins.wpgallery){c=b.plugins.wpgallery._do_gallery(c)}}else{if(c.indexOf("[embed")===0){if(b.plugins.wordpress){c=b.plugins.wordpress._setEmbed(c)}}}}b.execCommand("mceInsertContent",false,c)}else{if(f){QTags.insertContent(c)}else{document.getElementById(wpActiveEditor).value+=c}}try{tb_remove()}catch(d){}}var tb_position;(function(a){tb_position=function(){var f=a("#TB_window"),e=a(window).width(),d=a(window).height(),c=(720<e)?720:e,b=0;if(a("body.admin-bar").length){b=28}if(f.size()){f.width(c-50).height(d-45-b);a("#TB_iframeContent").width(c-50).height(d-75-b);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){f.css({top:20+b+"px","margin-top":"0"})}}return a("a.thickbox").each(function(){var g=a(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");a(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85-b))})};a(window).resize(function(){tb_position()});a(document).ready(function(b){b("a.thickbox").click(function(){var c;if(typeof(tinymce)!="undefined"&&tinymce.isIE&&(c=tinymce.get(wpActiveEditor))&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}})})})(jQuery);
+var wpActiveEditor;function send_to_editor(c){var b,a=typeof(tinymce)!="undefined",f=typeof(QTags)!="undefined";if(!wpActiveEditor){if(a&&tinymce.activeEditor){b=tinymce.activeEditor;wpActiveEditor=b.id}else{if(!f){return false}}}else{if(a&&tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){b=tinymce.activeEditor}else{b=tinymce.get(wpActiveEditor)}}if(b&&!b.isHidden()){if(tinymce.isIE&&b.windowManager.insertimagebookmark){b.selection.moveToBookmark(b.windowManager.insertimagebookmark)}if(c.indexOf("[caption")===0){if(b.plugins.wpeditimage){c=b.plugins.wpeditimage._do_shcode(c)}}else{if(c.indexOf("[gallery")===0){if(b.plugins.wpgallery){c=b.plugins.wpgallery._do_gallery(c)}}else{if(c.indexOf("[embed")===0){if(b.plugins.wordpress){c=b.plugins.wordpress._setEmbed(c)}}}}b.execCommand("mceInsertContent",false,c)}else{if(f){QTags.insertContent(c)}else{document.getElementById(wpActiveEditor).value+=c}}try{tb_remove()}catch(d){}}var tb_position;(function(a){tb_position=function(){var f=a("#TB_window"),e=a(window).width(),d=a(window).height(),c=(720<e)?720:e,b=0;if(a("body.admin-bar").length){b=28}if(f.size()){f.width(c-50).height(d-45-b);a("#TB_iframeContent").width(c-50).height(d-75-b);f.css({"margin-left":"-"+parseInt(((c-50)/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){f.css({top:20+b+"px","margin-top":"0"})}}return a("a.thickbox").each(function(){var g=a(this).attr("href");if(!g){return}g=g.replace(/&width=[0-9]+/g,"");g=g.replace(/&height=[0-9]+/g,"");a(this).attr("href",g+"&width="+(c-80)+"&height="+(d-85-b))})};a(window).resize(function(){tb_position()});a(document).ready(function(b){b("a.thickbox").click(function(){var c;if(typeof(tinymce)!="undefined"&&tinymce.isIE&&(c=tinymce.get(wpActiveEditor))&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}})})})(jQuery);

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 @@
 }
 
-

trunk/wp-includes/script-loader.php

@@ -277 +277 @@
     $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() ) {