Wordpress 3.3

[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 b19f2922194b3bf963d5338c92fcc3d1bf9ef287..488e3a01f21c48a67126560fe2f9fed7065a39eb 100644 (file)
--- a/wp-admin/js/media-upload.dev.js
+++ b/wp-admin/js/media-upload.dev.js
@@ -1,8 +1,25 @@
 // 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() ) {
+       if ( ed && !ed.isHidden() ) {
                // restore caret position on IE
                if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
                        ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
@@ -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
@@ -62,7 +78,7 @@ var tb_position;
                $('a.thickbox').click(function(){
                        var ed;
 
-                       if ( typeof tinyMCE != 'undefined' && tinymce.isIE && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
+                       if ( typeof(tinymce) != 'undefined' && tinymce.isIE && ( ed = tinymce.get(wpActiveEditor) ) && !ed.isHidden() ) {
                                ed.focus();
                                ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
                        }