WordPress 3.4.2

[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 e2c00ae229d9665dabf803e6373f2f2d8abe33f1..9b998ff2a3d582b8a3dadff670db2637fde1d795 100644 (file)
--- a/wp-admin/js/media-upload.dev.js
+++ b/wp-admin/js/media-upload.dev.js
@@ -1,43 +1,65 @@
 // 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);
+               } else if ( h.indexOf('[embed') === 0 ) {
+                       if ( ed.plugins.wordpress )
+                               h = ed.plugins.wordpress._setEmbed(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
 var tb_position;
 (function($) {
        tb_position = function() {
-               var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width;
+               var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width, adminbar_height = 0;
+
+               if ( $('body.admin-bar').length )
+                       adminbar_height = 28;
 
                if ( tbWindow.size() ) {
-                       tbWindow.width( W - 50 ).height( H - 45 );
-                       $('#TB_iframeContent').width( W - 50 ).height( H - 75 );
+                       tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
+                       $('#TB_iframeContent').width( W - 50 ).height( H - 75 - adminbar_height );
                        tbWindow.css({'margin-left': '-' + parseInt((( W - 50 ) / 2),10) + 'px'});
                        if ( typeof document.body.style.maxWidth != 'undefined' )
-                               tbWindow.css({'top':'20px','margin-top':'0'});
+                               tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
                };
 
                return $('a.thickbox').each( function() {
@@ -45,19 +67,22 @@ var tb_position;
                        if ( ! href ) return;
                        href = href.replace(/&width=[0-9]+/g, '');
                        href = href.replace(/&height=[0-9]+/g, '');
-                       $(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 ) );
+                       $(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) );
                });
        };
 
        $(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);