WordPress 3.9

[autoinstalls/wordpress.git] / wp-admin / js / plugin-install.js

diff --git a/wp-admin/js/plugin-install.js b/wp-admin/js/plugin-install.js
index a5029ece39173766cfcd782df4b7128e28af553a..9f686fc6beaa75be65d03b5b907360109207989c 100644 (file)
--- a/wp-admin/js/plugin-install.js
+++ b/wp-admin/js/plugin-install.js
@@ -2,37 +2,41 @@
 
 /* Plugin Browser Thickbox related JS*/
 var tb_position;
-jQuery(document).ready(function($) {
+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;
-
-               if ( $('body.admin-bar').length ) {
-                       adminbar_height = parseInt( jQuery('#wpadminbar').css('height'), 10 );
-               }
+               var tbWindow = $( '#TB_window' ),
+                       width = $( window ).width(),
+                       H = $( window ).height() - ( ( 850 < width ) ? 60 : 20 ),
+                       W = ( 850 < width ) ? 830 : width - 20;
 
                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.width( W ).height( H );
+                       $( '#TB_iframeContent' ).width( W ).height( H );
+                       tbWindow.css({
+                               'margin-left': '-' + parseInt( ( W / 2 ), 10 ) + 'px'
+                       });
+                       if ( typeof document.body.style.maxWidth !== 'undefined' ) {
+                               tbWindow.css({
+                                       'top': ( ( 850 < width ) ? 30 : 10 ) + 'px',
+                                       'margin-top': '0'
+                               });
+                       }
                }
 
-               return $('a.thickbox').each( function() {
-                       var href = $(this).attr('href');
-                       if ( ! href )
+               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 ) );
+                       }
+                       href = href.replace( /&width=[0-9]+/g, '' );
+                       href = href.replace( /&height=[0-9]+/g, '' );
+                       $(this).attr( 'href', href + '&width=' + W + '&height=' + ( H ) );
                });
        };
 
-       $(window).resize(function(){ tb_position(); });
+       $( window ).resize( function() {
+               tb_position();
+       });
 
        $('.plugins').on( 'click', 'a.thickbox', function() {
                tb_click.call(this);
@@ -43,18 +47,18 @@ jQuery(document).ready(function($) {
        });
 
        /* Plugin install related JS*/
-       $('#plugin-information #sidemenu a').click( function() {
-               var tab = $(this).attr('name');
+       $( '#plugin-information-tabs a' ).click( function( event ) {
+               var tab = $( this ).attr( 'name' );
+               event.preventDefault();
                //Flip the tab
-               $('#plugin-information-header a.current').removeClass('current');
-               $(this).addClass('current');
+               $( '#plugin-information-tabs a.current' ).removeClass( 'current' );
+               $( this ).addClass( 'current' );
                //Flip the content.
-               $('#section-holder div.section').hide(); //Hide 'em all
-               $('#section-' + tab).show();
-               return false;
+               $( '#section-holder div.section' ).hide(); //Hide 'em all
+               $( '#section-' + tab ).show();
        });
 
-       $('a.install-now').click( function() {
+       $( 'a.install-now' ).click( function() {
                return confirm( plugininstallL10n.ays );
        });
 });