Ticket #24019: media.patch

wp-includes/js/media-editor.js

@@ -59 +59 @@
 
                                 sizes = attachment.sizes;
                                 size = sizes && sizes[ props.size ] ? sizes[ props.size ] : attachment;
-
+                                linkSize = props.linkUrl ? sizes[ props.linkFileSize ] || 'full' : props.linkUrl;
+                                
                                 _.extend( props, _.pick( attachment, 'align', 'caption', 'alt' ), {
                                         width:     size.width,
                                         height:    size.height,
                                         src:       size.url,
-                                        captionId: 'attachment_' + attachment.id
+                                        captionId: 'attachment_' + attachment.id,
+                                        linkUrl:   linkSize.url
                                 });
                         } else if ( 'video' === attachment.type || 'audio' === attachment.type ) {
                                 _.extend( props, _.pick( attachment, 'title', 'type', 'icon', 'mime' ) );

wp-includes/js/media-views.js

@@ -3983 +3983 @@
 
                         media.view.Settings.prototype.initialize.apply( this, arguments );
                         this.model.on( 'change:link', this.updateLinkTo, this );
+                        this.model.on( 'change:linkFileSize', this.updateLinkTo, this );
 
                         if ( attachment )
                                 attachment.on( 'change:uploading', this.render, this );
@@ -4013 +4014 @@
                 updateLinkTo: function() {
                         var linkTo = this.model.get('link'),
                                 $input = this.$('.link-to-custom'),
-                                attachment = this.options.attachment;
+                                $filesize = this.$('.link-to-file-size'),
+                                attachment = this.options.attachment,
+                                sizes = attachment.get('sizes');
 
                         if ( 'none' === linkTo || ( ! attachment && 'custom' !== linkTo ) ) {
                                 $input.hide();
@@ -4021 +4024 @@
                         }
 
                         if ( attachment ) {
+                                if ( sizes && 'file' === linkTo ) {
+                                        $filesize.show();
+                                } else {
+                                        $filesize.hide();
+                                }
+                        
                                 if ( 'post' === linkTo ) {
                                         $input.val( attachment.get('link') );
                                 } else if ( 'file' === linkTo ) {
-                                        $input.val( attachment.get('url') );
+                                        if( sizes ) {
+                                                $input.val( sizes[$filesize.val()].url );
+                                        } else {
+                                                $input.val( attachment.get('url') );
+                                        }
                                 } else if ( ! this.model.get('linkUrl') ) {
                                         $input.val('http://');
                                 }

wp-includes/media-template.php

@@ -302 +302 @@
                                         </option>
                                 </select>
                         </label>
+                        <# if ( 'undefined' !== typeof data.sizes ) { #>
+                                <select class="link-to-file-size" data-setting="linkFileSize">
+                                        <?php
+                                        
+                                        $sizes = apply_filters( 'image_size_names_choose', array(
+                                                        'thumbnail' => __('Thumbnail'),
+                                                        'medium'    => __('Medium'),
+                                                        'large'     => __('Large'),
+                                                        'full'      => __('Full Size'),
+                                        ) );
+
+                                        foreach ( $sizes as $value => $name ) : ?>
+                                                        <#
+                                                        var size = data.sizes['<?php echo esc_js( $value ); ?>'];
+                                                        if ( size ) { #>
+                                                                        <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'full' ); ?>>
+                                                                                        <?php echo esc_html( $name ); ?> &ndash; {{ size.width }} &times; {{ size.height }}
+                                                                        </option>
+                                                        <# } #>
+                                        <?php endforeach; ?>
+                                </select>
+                        <# } #>
                         <input type="text" class="link-to-custom" data-setting="linkUrl" />
                 </div>