WordPress 3.8.2-scripts

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

diff --git a/wp-admin/js/media-upload.js b/wp-admin/js/media-upload.js
index 9fc2e8197da892898653d09d8dd325321cd38801..549d660d949cd1f538310b8dd93b8b0353becc07 100644 (file)
--- a/wp-admin/js/media-upload.js
+++ b/wp-admin/js/media-upload.js
@@ -1,8 +1,9 @@
+/* global tinymce, QTags, tb_remove */
 // send html to the post editor
 
-var wpActiveEditor;
+var wpActiveEditor, send_to_editor;
 
-function send_to_editor(h) {
+send_to_editor = function(h) {
        var ed, mce = typeof(tinymce) != 'undefined', qt = typeof(QTags) != 'undefined';
 
        if ( !wpActiveEditor ) {
@@ -42,25 +43,30 @@ function send_to_editor(h) {
                document.getElementById(wpActiveEditor).value += h;
        }
 
-       try{tb_remove();}catch(e){};
-}
+       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, adminbar_height = 0;
+               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 ( $('body.admin-bar').length ) {
+                       adminbar_height = parseInt( jQuery('#wpadminbar').css('height'), 10 );
+               }
 
                if ( tbWindow.size() ) {
                        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': 20 + adminbar_height + 'px','margin-top':'0'});
-               };
+                       tbWindow.css({'margin-left': '-' + parseInt( ( ( W - 50 ) / 2 ), 10 ) + 'px'});
+                       if ( typeof document.body.style.maxWidth !== 'undefined' )
+                               tbWindow.css({'top': 20 + adminbar_height + 'px', 'margin-top': '0'});
+               }
 
                return $('a.thickbox').each( function() {
                        var href = $(this).attr('href');