Changeset 23008

Timestamp:

12/04/2012 04:04:45 AM (12 years ago)

Author:

nacin

Message:

Media: When an image does not have all image sizes available, make sure we insert the requested size into the editor. props koopersmith. fixes #22693.

Location:

trunk/wp-includes

Files:

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

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

@@ -3746 +3746 @@
             var value = this.model.get( key ),
                 $setting = this.$('[data-setting="' + key + '"]'),
-                $buttons;
+                $buttons, $value;
 
             // Bail if we didn't find a matching setting.
@@ -3757 +3757 @@
             // Handle dropdowns.
             if ( $setting.is('select') ) {
-                $setting.find('[value="' + value + '"]').attr( 'selected', true );
+                $value = $setting.find('[value="' + value + '"]');
+
+                if ( $value.length ) {
+                    $value.attr( 'selected', true );
+                } else {
+                    // If we can't find the desired value, record what *is* selected.
+                    this.model.set( $setting.data('setting'), $setting.find('[selected]').val() );
+                }
+
 
             // Handle button groups.

trunk/wp-includes/media.php

@@ -1826 +1826 @@
                         var size = data.sizes['<?php echo esc_js( $value ); ?>'];
                         if ( size ) { #>
-                            <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, 'medium' ); ?>>
+                            <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>