Changeset 16681

Timestamp:

12/02/2010 04:20:48 AM (13 years ago)

Author:

markjaquith

Message:

Make sure media upload thickbox takes admin bar height into account. props ocean90. fixes #15635

Location:

trunk

Files:

• wp-admin/js/media-upload.dev.js (modified) (2 diffs)
• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)

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

@@ -34 +34 @@
 (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'});
         };
 
@@ -49 +52 @@
             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 ) );
         });
     };

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

@@ -1 @@
-function send_to_editor(b){var a;if(typeof tinyMCE!="undefined"&&(a=tinyMCE.activeEditor)&&!a.isHidden()){a.focus();if(tinymce.isIE){a.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark)}if(b.indexOf("[caption")===0){if(a.plugins.wpeditimage){b=a.plugins.wpeditimage._do_shcode(b)}}else{if(b.indexOf("[gallery")===0){if(a.plugins.wpgallery){b=a.plugins.wpgallery._do_gallery(b)}}else{if(b.indexOf("[embed")===0){if(a.plugins.wordpress){b=a.plugins.wordpress._setEmbed(b)}}}}a.execCommand("mceInsertContent",false,b)}else{if(typeof edInsertContent=="function"){edInsertContent(edCanvas,b)}else{jQuery(edCanvas).val(jQuery(edCanvas).val()+b)}}tb_remove()}var tb_position;(function(a){tb_position=function(){var e=a("#TB_window"),d=a(window).width(),c=a(window).height(),b=(720<d)?720:d;if(e.size()){e.width(b-50).height(c-45);a("#TB_iframeContent").width(b-50).height(c-75);e.css({"margin-left":"-"+parseInt(((b-50)/2),10)+"px"});if(typeof document.body.style.maxWidth!="undefined"){e.css({top:"20px","margin-top":"0"})}}return a("a.thickbox").each(function(){var f=a(this).attr("href");if(!f){return}f=f.replace(/&width=[0-9]+/g,"");f=f.replace(/&height=[0-9]+/g,"");a(this).attr("href",f+"&width="+(b-80)+"&height="+(c-85))})};a(window).resize(function(){tb_position()})})(jQuery);jQuery(document).ready(function(a){a("a.thickbox").click(function(){if(typeof tinyMCE!="undefined"&&tinyMCE.activeEditor){tinyMCE.get("content").focus();tinyMCE.activeEditor.windowManager.bookmark=tinyMCE.activeEditor.selection.getBookmark("simple")}})});
+function send_to_editor(h){var ed;if(typeof tinyMCE!="undefined"&&(ed=tinyMCE.activeEditor)&&!ed.isHidden()){ed.focus();if(tinymce.isIE){ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark)}if(h.indexOf("[caption")===0){if(ed.plugins.wpeditimage){h=ed.plugins.wpeditimage._do_shcode(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{jQuery(edCanvas).val(jQuery(edCanvas).val()+h)}}tb_remove()}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;if($("body.admin-bar").length){adminbar_height=28}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"})}}return $("a.thickbox").each(function(){var href=$(this).attr("href");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-adminbar_height))})};$(window).resize(function(){tb_position()})})(jQuery);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")}})});

trunk/wp-includes/script-loader.php

@@ -370 +370 @@
         $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ), '20090516' );
 
-        $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20091023' );
+        $scripts->add( 'media-upload', "/wp-admin/js/media-upload$suffix.js", array( 'thickbox' ), '20101201' );
         $scripts->add_data( 'media-upload', 'group', 1 );