Make WordPress Core

Ticket #31352: 31352.2.diff

File 31352.2.diff, 6.1 KB (added by joemcgill, 10 years ago)
  • src/wp-includes/js/media/views.js

    diff --git src/wp-includes/images/media/archive-2x.png src/wp-includes/images/media/archive-2x.png
    new file mode 100644
    index 0000000..786f3dd
    Binary files /dev/null and src/wp-includes/images/media/archive-2x.png differ
    diff --git src/wp-includes/images/media/archive.png src/wp-includes/images/media/archive.png
    index 2864901..536e006 100644
    Binary files src/wp-includes/images/media/archive.png and src/wp-includes/images/media/archive.png differ
    diff --git src/wp-includes/images/media/audio-2x.png src/wp-includes/images/media/audio-2x.png
    new file mode 100644
    index 0000000..0df7ad2
    Binary files /dev/null and src/wp-includes/images/media/audio-2x.png differ
    diff --git src/wp-includes/images/media/audio.png src/wp-includes/images/media/audio.png
    index 455d9f2..f89f712 100644
    Binary files src/wp-includes/images/media/audio.png and src/wp-includes/images/media/audio.png differ
    diff --git src/wp-includes/images/media/code-2x.png src/wp-includes/images/media/code-2x.png
    new file mode 100644
    index 0000000..f31aaff
    Binary files /dev/null and src/wp-includes/images/media/code-2x.png differ
    diff --git src/wp-includes/images/media/code.png src/wp-includes/images/media/code.png
    index 2b1b919..55a1fc6 100644
    Binary files src/wp-includes/images/media/code.png and src/wp-includes/images/media/code.png differ
    diff --git src/wp-includes/images/media/default-2x.png src/wp-includes/images/media/default-2x.png
    new file mode 100644
    index 0000000..a8e6b25
    Binary files /dev/null and src/wp-includes/images/media/default-2x.png differ
    diff --git src/wp-includes/images/media/default.png src/wp-includes/images/media/default.png
    index fd80a9e..74abcaa 100644
    Binary files src/wp-includes/images/media/default.png and src/wp-includes/images/media/default.png differ
    diff --git src/wp-includes/images/media/document-2x.png src/wp-includes/images/media/document-2x.png
    new file mode 100644
    index 0000000..b6511aa
    Binary files /dev/null and src/wp-includes/images/media/document-2x.png differ
    diff --git src/wp-includes/images/media/document.png src/wp-includes/images/media/document.png
    index 4f04cca..bd02053 100644
    Binary files src/wp-includes/images/media/document.png and src/wp-includes/images/media/document.png differ
    diff --git src/wp-includes/images/media/interactive-2x.png src/wp-includes/images/media/interactive-2x.png
    new file mode 100644
    index 0000000..10cab6e
    Binary files /dev/null and src/wp-includes/images/media/interactive-2x.png differ
    diff --git src/wp-includes/images/media/interactive.png src/wp-includes/images/media/interactive.png
    index a09b413..276e4a4 100644
    Binary files src/wp-includes/images/media/interactive.png and src/wp-includes/images/media/interactive.png differ
    diff --git src/wp-includes/images/media/spreadsheet-2x.png src/wp-includes/images/media/spreadsheet-2x.png
    new file mode 100644
    index 0000000..3476f95
    Binary files /dev/null and src/wp-includes/images/media/spreadsheet-2x.png differ
    diff --git src/wp-includes/images/media/spreadsheet.png src/wp-includes/images/media/spreadsheet.png
    index db60df2..53cb78d 100644
    Binary files src/wp-includes/images/media/spreadsheet.png and src/wp-includes/images/media/spreadsheet.png differ
    diff --git src/wp-includes/images/media/text-2x.png src/wp-includes/images/media/text-2x.png
    new file mode 100644
    index 0000000..2378e96
    Binary files /dev/null and src/wp-includes/images/media/text-2x.png differ
    diff --git src/wp-includes/images/media/text.png src/wp-includes/images/media/text.png
    index d1bc265..b8b8524 100644
    Binary files src/wp-includes/images/media/text.png and src/wp-includes/images/media/text.png differ
    diff --git src/wp-includes/images/media/video-2x.png src/wp-includes/images/media/video-2x.png
    new file mode 100644
    index 0000000..2ad1f40
    Binary files /dev/null and src/wp-includes/images/media/video-2x.png differ
    diff --git src/wp-includes/images/media/video.png src/wp-includes/images/media/video.png
    index 01441cc..ed9cc9b 100644
    Binary files src/wp-includes/images/media/video.png and src/wp-includes/images/media/video.png differ
    diff --git src/wp-includes/js/media/views.js src/wp-includes/js/media/views.js
    index a2f3f22..b52ffbd 100644
    Attachment = View.extend({ 
    27212721                        options.size = this.imageSize();
    27222722                }
    27232723
     2724                // add support for retina icons
     2725                if ( '' !== options.icon ) {
     2726                        options.icon2x = options.icon.replace('.png', '-2x.png');
     2727                }
     2728
    27242729                options.can = {};
    27252730                if ( options.nonces ) {
    27262731                        options.can.remove = !! options.nonces['delete'];
  • src/wp-includes/media-template.php

    diff --git src/wp-includes/media-template.php src/wp-includes/media-template.php
    index 4bbbfc1..dcb0087 100644
    function wp_print_media_templates() { 
    297297                                <# } else if ( 'image' === data.type && data.sizes && data.sizes.full ) { #>
    298298                                        <img class="details-image" src="{{ data.sizes.full.url }}" draggable="false" />
    299299                                <# } else if ( -1 === jQuery.inArray( data.type, [ 'audio', 'video' ] ) ) { #>
    300                                         <img class="details-image" src="{{ data.icon }}" class="icon" draggable="false" />
     300                                        <img class="details-image" src="{{ data.icon }}" srcset="{{ data.icon2x }} 2x" class="icon" draggable="false" />
    301301                                <# } #>
    302302
    303303                                <# if ( 'audio' === data.type ) { #>
    function wp_print_media_templates() { 
    461461                                                <# if ( data.image && data.image.src && data.image.src !== data.icon ) { #>
    462462                                                        <img src="{{ data.image.src }}" class="thumbnail" draggable="false" />
    463463                                                <# } else { #>
    464                                                         <img src="{{ data.icon }}" class="icon" draggable="false" />
     464                                                        <img src="{{ data.icon }}" srcset="{{ data.icon2x}} 2x" class="icon" draggable="false" />
    465465                                                <# } #>
    466466                                        </div>
    467467                                        <div class="filename">
    function wp_print_media_templates() { 
    511511                                <# } else if ( 'image' === data.type && data.sizes ) { #>
    512512                                        <img src="{{ data.size.url }}" draggable="false" />
    513513                                <# } else { #>
    514                                         <img src="{{ data.icon }}" class="icon" draggable="false" />
     514                                        <img src="{{ data.icon }}" srcset="{{ data.icon2x }} 2x" class="icon" draggable="false" />
    515515                                <# } #>
    516516                        </div>
    517517                        <div class="details">