Wordpress 3.1

[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..7d2565c799f6b392a424f93d119723412c13c28c 100644 (file)
--- a/wp-admin/js/media-upload.dev.js
+++ b/wp-admin/js/media-upload.dev.js
@@ -4,7 +4,7 @@ function send_to_editor(h) {
 
        if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
                ed.focus();
-               if (tinymce.isIE)
+               if ( tinymce.isIE )
                        ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark);
 
                if ( h.indexOf('[caption') === 0 ) {
@@ -13,6 +13,9 @@ function send_to_editor(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);
@@ -30,14 +33,17 @@ function send_to_editor(h) {
 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,7 +51,7 @@ 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 ) );
                });
        };