From 2af4da91bb4f5fe4abae6c64b9e1461a151a6db0 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 22 Nov 2013 08:05:42 +0000 Subject: [PATCH] Fix thickbox positioning on Manage Themes screen. Adjust thickbox resizing code on various screens for new toolbar height. see #26078. fixes #26140. git-svn-id: https://develop.svn.wordpress.org/trunk@26323 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/js/media-upload.js | 17 +++++++++++------ src/wp-admin/js/plugin-install.js | 17 +++++++++++------ src/wp-admin/js/theme-install.js | 27 --------------------------- src/wp-admin/js/theme.js | 27 +++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 39 deletions(-) diff --git a/src/wp-admin/js/media-upload.js b/src/wp-admin/js/media-upload.js index bcc9724ec1..549d660d94 100644 --- a/src/wp-admin/js/media-upload.js +++ b/src/wp-admin/js/media-upload.js @@ -50,17 +50,22 @@ send_to_editor = function(h) { 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() { diff --git a/src/wp-admin/js/plugin-install.js b/src/wp-admin/js/plugin-install.js index 0a3167a2d0..a5029ece39 100644 --- a/src/wp-admin/js/plugin-install.js +++ b/src/wp-admin/js/plugin-install.js @@ -4,17 +4,22 @@ var tb_position; jQuery(document).ready(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() { diff --git a/src/wp-admin/js/theme-install.js b/src/wp-admin/js/theme-install.js index e2a46c97e0..f61e8a7fd4 100644 --- a/src/wp-admin/js/theme-install.js +++ b/src/wp-admin/js/theme-install.js @@ -22,33 +22,6 @@ jQuery( function($) { }); }); -/** - * Theme Browser Thickbox - * - * Aligns theme browser thickbox. - */ -var tb_position; -jQuery(document).ready( function($) { - tb_position = function() { - var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 1040 < width ) ? 1040 : 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'}); - } - } - }; - - $(window).resize(function(){ tb_position(); }); -}); - /** * Theme Install * diff --git a/src/wp-admin/js/theme.js b/src/wp-admin/js/theme.js index 257a6e0127..db62c136bd 100644 --- a/src/wp-admin/js/theme.js +++ b/src/wp-admin/js/theme.js @@ -661,3 +661,30 @@ jQuery( document ).ready( ); })( jQuery ); + +// Align theme browser thickbox +var tb_position; +jQuery(document).ready( function($) { + tb_position = function() { + var tbWindow = $('#TB_window'), + width = $(window).width(), + H = $(window).height(), + W = ( 1040 < width ) ? 1040 : width, + adminbar_height = 0; + + 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'}); + } + } + }; + + $(window).resize(function(){ tb_position(); }); +});