Changeset 29779

Timestamp:

09/29/2014 03:44:25 AM (10 years ago)

Author:

wonderboymusic

Message:

Add size to the UI for Gallery Settings in the media modal. Ensure that the TinyMCE view is refreshed when size changes.

Props richardmtl, noplanman, wonderboymusic.
Fixes #18143.

Location:

trunk/src/wp-includes

Files:

• js/mce-view.js (modified) (4 diffs)
• media-template.php (modified) (1 diff)

trunk/src/wp-includes/js/mce-view.js

@@ -438 +438 @@
          * @param view {object} being refreshed
          * @param text {string} textual representation of the view
+         * @param force {Boolean} whether to force rendering
          */
-        refreshView: function( view, text ) {
+        refreshView: function( view, text, force ) {
             var encodedText = window.encodeURIComponent( text ),
                 viewOptions,
@@ -455 +456 @@
             }
 
-            instance.render();
+            instance.render( force );
         },
 
@@ -526 +527 @@
                     _.each( attachments, function( attachment ) {
                         if ( attachment.sizes ) {
-                            if ( attachment.sizes.thumbnail ) {
+                            if ( attrs.size && attachment.sizes[ attrs.size ] ) {
+                                attachment.thumbnail = attachment.sizes[ attrs.size ];
+                            } else if ( attachment.sizes.thumbnail ) {
                                 attachment.thumbnail = attachment.sizes.thumbnail;
                             } else if ( attachment.sizes.full ) {
@@ -553 +556 @@
 
             frame.state('gallery-edit').on( 'update', function( selection ) {
-                var shortcode = gallery.shortcode( selection ).string();
+                var shortcode = gallery.shortcode( selection ).string(), force;
                 $( node ).attr( 'data-wpview-text', window.encodeURIComponent( shortcode ) );
-                wp.mce.views.refreshView( self, shortcode );
+                force = ( data !== shortcode );
+                wp.mce.views.refreshView( self, shortcode, force );
             });
 

trunk/src/wp-includes/media-template.php

@@ -734 +734 @@
             <span><?php _e( 'Random Order' ); ?></span>
             <input type="checkbox" data-setting="_orderbyRandom" />
+        </label>
+
+        <label class="setting size">
+            <span><?php _e( 'Size' ); ?></span>
+            <select class="size" name="size"
+                data-setting="size"
+                <# if ( data.userSettings ) { #>
+                    data-user-setting="imgsize"
+                <# } #>
+                >
+                <?php
+                // This filter is documented in wp-admin/includes/media.php
+                $size_names = apply_filters( 'image_size_names_choose', array(
+                    'thumbnail' => __( 'Thumbnail' ),
+                    'medium'    => __( 'Medium' ),
+                    'large'     => __( 'Large' ),
+                    'full'      => __( 'Full Size' ),
+                ) );
+
+                foreach ( $size_names as $size => $label ) : ?>
+                    <option value="<?php echo esc_attr( $size ); ?>">
+                        <?php echo esc_html( $label ); ?>
+                    </option>
+                <?php endforeach; ?>
+            </select>
         </label>
     </script>