From b06d75f58b2a3bc4a3d61fbe2664b5edfdbb0ef2 Mon Sep 17 00:00:00 2001
From: Daryl Koopersmith <koop@git.wordpress.org>
Date: Fri, 9 Nov 2012 06:15:25 +0000
Subject: [PATCH] Media: Add size dropdown to attachment display settings in
 the media modal. fixes #22206, see #21390.

git-svn-id: https://develop.svn.wordpress.org/trunk@22493 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/js/media-views.js |  7 ++++---
 wp-includes/media.php         | 29 +++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js
index 07504c0f79..7f4ccee544 100644
--- a/wp-includes/js/media-views.js
+++ b/wp-includes/js/media-views.js
@@ -948,11 +948,11 @@
 		attachmentSettingsSidebar: function( options ) {
 			var state = this.state(),
 				display = state.get('details'),
-				single = state.get('selection').single().cid;
+				single = state.get('selection').single();
 
 			this.settingsSidebar({ silent: true });
 
-			display[ single ] = display[ single ] || new Backbone.Model({
+			display[ single.cid ] = display[ single.cid ] || new Backbone.Model({
 				align: getUserSetting( 'align', 'none' ),
 				size:  getUserSetting( 'imgsize', 'medium' ),
 				link:  getUserSetting( 'urlbutton', 'post' )
@@ -961,7 +961,8 @@
 			this.sidebar.view().add({
 				display: new media.view.Settings.AttachmentDisplay({
 					controller:   this,
-					model:        display[ single ],
+					model:        display[ single.cid ],
+					sizes:        single.get('sizes'),
 					priority:     100,
 					userSettings: state.get('displayUserSettings')
 				}).render()
diff --git a/wp-includes/media.php b/wp-includes/media.php
index 8a1bf41009..13c8c8f98f 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1471,6 +1471,35 @@ function wp_print_media_templates( $attachment ) {
 				<?php esc_attr_e('None'); ?>
 			</button>
 		</div>
+
+		<# if ( ! _.isUndefined( sizes ) ) { #>
+			<h4><?php _e('Size'); ?></h4>
+			<select class="size" name="size"
+				data-setting="size"
+				<# if ( userSettings ) { #>
+					data-user-setting="imgsize"
+				<# } #>>
+				<?php
+
+				$sizes = apply_filters( 'image_size_names_choose', array(
+					'thumbnail' => __('Thumbnail'),
+					'medium'    => __('Medium'),
+					'large'     => __('Large'),
+				) );
+
+				foreach ( $sizes as $value => $name ) : ?>
+					<# if ( ! _.isUndefined( sizes['<?php echo esc_js( $value ); ?>'] ) ) { #>
+						<option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'medium' ); ?>>
+							<?php echo esc_html( $name ); ?>
+						</option>
+					<# } #>>
+				<?php endforeach; ?>
+
+				<option value="full">
+					<?php echo esc_html_e( 'Full Size' ); ?>
+				</option>
+			</select>
+		<# } #>
 	</script>
 
 	<script type="text/html" id="tmpl-gallery-settings">