diff -r 2f6f6f7551ca -r 32102edaa81b web/wp-admin/js/plugin-install.dev.js --- a/web/wp-admin/js/plugin-install.dev.js Thu Sep 16 15:45:36 2010 +0000 +++ b/web/wp-admin/js/plugin-install.dev.js Mon Nov 19 18:26:13 2012 +0100 @@ -1,27 +1,35 @@ /* Plugin Browser Thickbox related JS*/ +var tb_position; jQuery(document).ready(function($) { - var thickDims = function() { - var tbWindow = $('#TB_window'), width = $(window).width(), H = $(window).height(), W = ( 720 < width ) ? 720 : width; + 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 ); - $('#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 ( ! ( $.browser.msie && $.browser.version.substr(0,1) < 7 ) ) - tbWindow.css({'top':'20px','margin-top':'0'}); + if ( typeof document.body.style.maxWidth != 'undefined' ) + tbWindow.css({'top': 20 + adminbar_height + 'px','margin-top':'0'}); }; - return $('#dashboard_plugins a.thickbox, .plugins a.thickbox').each( function() { + 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 ) ); + $(this).attr( 'href', href + '&width=' + ( W - 80 ) + '&height=' + ( H - 85 - adminbar_height ) ); }); }; - thickDims().click( function() { + $(window).resize(function(){ tb_position(); }); + + $('#dashboard_plugins a.thickbox, .plugins a.thickbox').click( function() { + tb_click.call(this); + $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'}); $('#TB_ajaxWindowTitle').html('' + plugininstallL10n.plugin_information + ' ' + $(this).attr('title') ); return false; @@ -38,4 +46,8 @@ $('#section-' + tab).show(); return false; }); + + $('a.install-now').click( function() { + return confirm( plugininstallL10n.ays ); + }); });