WordPress 3.6.1

[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 fb6be93200bf9fae74d262742418bfab0ff50caf..26e9982e28ecdb8664de2f2d236d47c1343a28d6 100644 (file)
--- a/wp-admin/js/plugin-install.js
+++ b/wp-admin/js/plugin-install.js
@@ -1,17 +1,18 @@
 /* Plugin Browser Thickbox related JS*/
-jQuery(function($) {
-       var thickDims = function() {
-               var tbWindow = $('#TB_window');
-               var width = $(window).width();
-               var H = $(window).height();
-               var W = ( 720 < width ) ? 720 : width;
+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;
+
+               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 $('a.thickbox').each( function() {
@@ -20,24 +21,21 @@ jQuery(function($) {
                                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, .plugins').on( 'click', 'a.thickbox', function() {
+               tb_click.call(this);
+
                $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
                $('#TB_ajaxWindowTitle').html('<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).attr('title') );
                return false;
        });
-});
-
-/* Plugin install related JS*/
-jQuery(function($) {
-       $('#install-plugins tbody.plugins tr').click( function() {
-               $(this).find('.action-links a.onclick').click();
-               return false;
-       });
 
+       /* Plugin install related JS*/
        $('#plugin-information #sidemenu a').click( function() {
                var tab = $(this).attr('name');
                //Flip the tab
@@ -48,4 +46,8 @@ jQuery(function($) {
                $('#section-' + tab).show();
                return false;
        });
-});
\ No newline at end of file
+
+       $('a.install-now').click( function() {
+               return confirm( plugininstallL10n.ays );
+       });
+});