Ticket #17329: 17329.2.diff

wp-includes/js/thickbox/thickbox.css

@@ -49 +49 @@
         background: #ffffff;
         z-index: 102;
         color:#000000;
-        display:none;
         text-align:left;
-        top:50%;
+        top:-9999px;
         left:50%;
         border: 1px solid #555;
         -moz-box-shadow: rgba(0,0,0,1) 0 4px 30px;

wp-includes/js/thickbox/thickbox.js

@@ -268 +268 @@
 
 //helper functions below
 function tb_showIframe(){
+        offset_top = jQuery("#TB_window").offset().top;
+        if( offset_top < 0 ) {
+                adminbar_height = ( jQuery('body.admin-bar').length ) ? 28 : 0;
+                offset_top = 20 + adminbar_height + 'px';
+        }
         jQuery("#TB_load").remove();
-        jQuery("#TB_window").css({display:"block"});
+        jQuery("#TB_window").css({display:"block", top: offset_top});
 }
 
 function tb_remove() {

wp-admin/js/theme-preview.dev.js

@@ -10 +10 @@
 
                 if ( tbWindow.size() ) {
                         tbWindow.width(w).height(h);
+                        offset_top = tbWindow.offset().top;
                         $('#TB_iframeContent').width(w).height(h - 27);
                         tbWindow.css({'margin-left': '-' + parseInt((w / 2),10) + 'px'});
-                        if ( typeof document.body.style.maxWidth != 'undefined' )
+                        if ( typeof document.body.style.maxWidth != 'undefined' && offset_top > 0 )
                                 tbWindow.css({'top':'30px','margin-top':'0'});
                 }
         };

wp-admin/js/media-upload.dev.js

@@ -40 +40 @@
 
                 if ( tbWindow.size() ) {
                         tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
+                        offset_top = tbWindow.offset().top;
                         $('#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' )
+                        if ( typeof document.body.style.maxWidth != 'undefined' && offset_top > 0 )
                                 tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
                 };
 

wp-admin/js/plugin-install.dev.js

@@ -9 +9 @@
 
                 if ( tbWindow.size() ) {
                         tbWindow.width( W - 50 ).height( H - 45 - adminbar_height );
+                        offset_top = tbWindow.offset().top;
                         $('#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' )
+                        if ( typeof document.body.style.maxWidth != 'undefined' && offset_top > 0 )
                                 tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'});
                 };