WordPress 3.4

[autoinstalls/wordpress.git] / wp-admin / js / media-upload.dev.js

diff --git a/wp-admin/js/media-upload.dev.js b/wp-admin/js/media-upload.dev.js
index 7d2565c799f6b392a424f93d119723412c13c28c..9b998ff2a3d582b8a3dadff670db2637fde1d795 100644 (file)
--- a/wp-admin/js/media-upload.dev.js
+++ b/wp-admin/js/media-upload.dev.js
@@ -1,15 +1,32 @@
 // send html to the post editor
+
+var wpActiveEditor;
+
 function send_to_editor(h) {
-       var ed;
+       var ed, mce = typeof(tinymce) != 'undefined', qt = typeof(QTags) != 'undefined';
+
+       if ( !wpActiveEditor ) {
+               if ( mce && tinymce.activeEditor ) {
+                       ed = tinymce.activeEditor;
+                       wpActiveEditor = ed.id;
+               } else if ( !qt ) {
+                       return false;
+               }
+       } else if ( mce ) {
+               if ( tinymce.activeEditor && (tinymce.activeEditor.id == 'mce_fullscreen' || tinymce.activeEditor.id == 'wp_mce_fullscreen') )
+                       ed = tinymce.activeEditor;
+               else
+                       ed = tinymce.get(wpActiveEditor);
+       }
 
-       if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
-               ed.focus();
-               if ( tinymce.isIE )
-                       ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark);
+       if ( ed && !ed.isHidden() ) {
+               // restore caret position on IE
+               if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
+                       ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
 
                if ( h.indexOf('[caption') === 0 ) {
-                       if ( ed.plugins.wpeditimage )
-                               h = ed.plugins.wpeditimage._do_shcode(h);
+                       if ( ed.wpSetImgCaption )
+                               h = ed.wpSetImgCaption(h);
                } else if ( h.indexOf('[gallery') === 0 ) {
                        if ( ed.plugins.wpgallery )
                                h = ed.plugins.wpgallery._do_gallery(h);
@@ -19,14 +36,13 @@ function send_to_editor(h) {
                }
 
                ed.execCommand('mceInsertContent', false, h);
-
-       } else if ( typeof edInsertContent == 'function' ) {
-               edInsertContent(edCanvas, h);
+       } else if ( qt ) {
+               QTags.insertContent(h);
        } else {
-               jQuery( edCanvas ).val( jQuery( edCanvas ).val() + h );
+               document.getElementById(wpActiveEditor).value += h;
        }
 
-       tb_remove();
+       try{tb_remove();}catch(e){};
 }
 
 // thickbox settings
@@ -57,13 +73,16 @@ var tb_position;
 
        $(window).resize(function(){ tb_position(); });
 
-})(jQuery);
+       // store caret position in IE
+       $(document).ready(function($){
+               $('a.thickbox').click(function(){
+                       var ed;
 
-jQuery(document).ready(function($){
-       $('a.thickbox').click(function(){
-               if ( typeof tinyMCE != 'undefined' && tinyMCE.activeEditor ) {
-                       tinyMCE.get('content').focus();
-                       tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark('simple');
-               }
+                       if ( typeof(tinymce) != 'undefined' && tinymce.isIE && ( ed = tinymce.get(wpActiveEditor) ) && !ed.isHidden() ) {
+                               ed.focus();
+                               ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
+                       }
+               });
        });
-});
+
+})(jQuery);