WordPress 4.2.4

[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 9f686fc6beaa75be65d03b5b907360109207989c..cd23dc7049dc9b8b16fb99348485ae2f486c93d6 100644 (file)
--- a/wp-admin/js/plugin-install.js
+++ b/wp-admin/js/plugin-install.js
@@ -1,4 +1,4 @@
-/* global plugininstallL10n, tb_click, confirm */
+/* global plugininstallL10n, tb_click */
 
 /* Plugin Browser Thickbox related JS*/
 var tb_position;
@@ -6,8 +6,8 @@ jQuery( document ).ready( function( $ ) {
        tb_position = function() {
                var tbWindow = $( '#TB_window' ),
                        width = $( window ).width(),
-                       H = $( window ).height() - ( ( 850 < width ) ? 60 : 20 ),
-                       W = ( 850 < width ) ? 830 : width - 20;
+                       H = $( window ).height() - ( ( 792 < width ) ? 60 : 20 ),
+                       W = ( 792 < width ) ? 772 : width - 20;
 
                if ( tbWindow.size() ) {
                        tbWindow.width( W ).height( H );
@@ -17,7 +17,7 @@ jQuery( document ).ready( function( $ ) {
                        });
                        if ( typeof document.body.style.maxWidth !== 'undefined' ) {
                                tbWindow.css({
-                                       'top': ( ( 850 < width ) ? 30 : 10 ) + 'px',
+                                       'top': '30px',
                                        'margin-top': '0'
                                });
                        }
@@ -38,27 +38,35 @@ jQuery( document ).ready( function( $ ) {
                tb_position();
        });
 
-       $('.plugins').on( 'click', 'a.thickbox', function() {
+       $( '.plugin-card, .plugins .column-description' ).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') );
+               $('#TB_title').css({'background-color':'#23282d','color':'#cfcfcf'});
+               $('#TB_ajaxWindowTitle').html( '<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).data( 'title' ) );
+               $('#TB_iframeContent').attr( 'title', plugininstallL10n.plugin_information + ' ' + $(this).data( 'title' ) );
+               $('#TB_closeWindowButton').focus();
+
                return false;
        });
 
-       /* Plugin install related JS*/
+       /* Plugin install related JS */
        $( '#plugin-information-tabs a' ).click( function( event ) {
                var tab = $( this ).attr( 'name' );
                event.preventDefault();
-               //Flip the tab
+
+               // Flip the tab
                $( '#plugin-information-tabs a.current' ).removeClass( 'current' );
                $( this ).addClass( 'current' );
-               //Flip the content.
-               $( '#section-holder div.section' ).hide(); //Hide 'em all
-               $( '#section-' + tab ).show();
-       });
 
-       $( 'a.install-now' ).click( function() {
-               return confirm( plugininstallL10n.ays );
+               // Only show the fyi box in the description section, on smaller screen, where it's otherwise always displayed at the top.
+               if ( 'description' !== tab && $( window ).width() < 772 ) {
+                       $( '#plugin-information-content' ).find( '.fyi' ).hide();
+               } else {
+                       $( '#plugin-information-content' ).find( '.fyi' ).show();
+               }
+
+               // Flip the content.
+               $( '#section-holder div.section' ).hide(); // Hide 'em all.
+               $( '#section-' + tab ).show();
        });
 });