Changeset 22493

Timestamp:

11/09/2012 06:15:25 AM (14 years ago)

Author:

koopersmith

Message:

Media: Add size dropdown to attachment display settings in the media modal. fixes #22206, see #21390.

Location:

trunk/wp-includes

Files:

• js/media-views.js (modified) (2 diffs)
• media.php (modified) (1 diff)

trunk/wp-includes/js/media-views.js

@@ -949 +949 @@
                         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' ),
@@ -962 +962 @@
                                 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')

trunk/wp-includes/media.php

@@ -1472 +1472 @@
                         </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>