Make WordPress Core

Ticket #29286: 29286.5.diff

File 29286.5.diff, 1.7 KB (added by stephdau, 11 years ago)
  • src/wp-admin/js/plugin-install.js

     
    3838                tb_position();
    3939        });
    4040
    41         $('.plugin-card').on( 'click', 'a.thickbox', function() {
    42                 tb_click.call(this);
     41        $('.plugin-card').on( 'click', function( e ) {
     42                // Don't trigger thickbox if the user is currently selecting text within it
     43                var s1 = window.getSelection,
     44                        s2 = document.getSelection,
     45                        s3 = document.selection,
     46                        s  = ( s1 ? s1() : (s2) ? s2() : ( s3 ? s3() : null ) );
    4347
     48                if ( s && s.type === 'Range' )
     49                        return false;
     50
     51                // Don't trigger thickbox if a link that doesn't have the proper class to do so (EGs: link to dev site & install button).
     52                if ( $( e.target ).is( 'a' ) && ! $( e.target ).is( 'a.thickbox' ) )
     53                        return true;
     54
     55                tb_click.call( $('a.thickbox', this)[0] ); // use the URL of the first thickbox link in the card
     56
    4457                $('#TB_title').css({'background-color':'#222','color':'#cfcfcf'});
    4558                $('#TB_ajaxWindowTitle').html( '<strong>' + plugininstallL10n.plugin_information + '</strong>&nbsp;' + $(this).data( 'title' ) );
    4659                $('#TB_iframeContent').attr( 'title', plugininstallL10n.plugin_information + ' ' + $(this).data( 'title' ) );
  • src/wp-admin/css/list-tables.css

     
    12411241        -webkit-box-sizing: border-box;
    12421242        -moz-box-sizing: border-box;
    12431243        box-sizing: border-box;
     1244        cursor: pointer;
    12441245}
    12451246
    12461247.plugin-card:nth-child(odd) {