Changeset 22882

Timestamp:

11/27/2012 11:20:12 PM (12 years ago)

Author:

nacin

Message:

When editing a plain, legacy [gallery] shortcode, ensure we are sorting its contents using menu_order.

When attachments are sorted, we convert the shortcode to [gallery ids=""], as before.

props koopersmith.
fixes #22608.

Location:

trunk/wp-includes

Files:

• js/media-editor.js (modified) (6 diffs)
• js/media-models.js (modified) (1 diff)
• js/media-views.js (modified) (5 diffs)
• media.php (modified) (2 diffs)

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

@@ -158 +158 @@
                 captiontag: 'dd',
                 columns:    3,
-                size:       'thumbnail'
+                size:       'thumbnail',
+                orderby:    'menu_order ID'
             },
 
@@ -171 +172 @@
                     return result;
 
-                attrs = shortcode.attrs.named;
+                // Fill the default shortcode attributes.
+                attrs = _.defaults( shortcode.attrs.named, wp.media.gallery.defaults );
                 args  = _.pick( attrs, 'orderby', 'order' );
 
                 args.type    = 'image';
                 args.perPage = -1;
+
+                // Map the `orderby` attribute to the corresponding model property.
+                if ( ! attrs.orderby || /^menu_order(?: ID)?$/i.test( attrs.orderby ) )
+                    args.orderby = 'menuOrder';
 
                 // Map the `ids` param to the correct query args.
@@ -205 +211 @@
             shortcode: function( attachments ) {
                 var props = attachments.props.toJSON(),
-                    attrs = _.pick( props, 'include', 'exclude', 'orderby', 'order' ),
+                    attrs = _.pick( props, 'orderby', 'order' ),
                     shortcode, clone;
 
@@ -211 +217 @@
                     _.extend( attrs, attachments.gallery.toJSON() );
 
+                // Convert all gallery shortcodes to use the `ids` property.
+                // Ignore `post__in` and `post__not_in`; the attachments in
+                // the collection will already reflect those properties.
                 attrs.ids = attachments.pluck('id');
+
+                // Copy the `parent` post ID.
+                if ( props.parent )
+                    attrs.id = props.parent;
 
                 // If the `ids` attribute is set and `orderby` attribute
@@ -273 +286 @@
                 });
 
-                return wp.media({
+                // Destroy the previous gallery frame.
+                if ( this.frame )
+                    this.frame.dispose();
+
+                // Store the current gallery frame.
+                this.frame = wp.media({
                     frame:     'post',
                     state:     'gallery-edit',
@@ -281 +299 @@
                     selection: selection
                 });
+
+                return this.frame;
             }
         };

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

@@ -660 +660 @@
 
         orderby: {
-            allowed:  [ 'name', 'author', 'date', 'title', 'modified', 'uploadedTo', 'id', 'post__in' ],
+            allowed:  [ 'name', 'author', 'date', 'title', 'modified', 'uploadedTo', 'id', 'post__in', 'menuOrder' ],
             valuemap: {
                 'id':         'ID',
-                'uploadedTo': 'parent'
+                'uploadedTo': 'parent',
+                'menuOrder':  'menu_order ID'
             }
         },
 
         propmap: {
-            'search':  's',
-            'type':    'post_mime_type',
-            'parent':  'post_parent',
-            'perPage': 'posts_per_page'
+            'search':    's',
+            'type':      'post_mime_type',
+            'parent':    'post_parent',
+            'perPage':   'posts_per_page',
+            'menuOrder': 'menu_order'
         },
 

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

@@ -2899 +2899 @@
                 text:  l10n.allMediaItems,
                 props: {
-                    parent: null
+                    parent:  null,
+                    orderby: 'date',
+                    order:   'DESC'
                 },
                 priority: 10
@@ -2907 +2909 @@
                 text:  l10n.uploadedToThisPost,
                 props: {
-                    parent: media.view.settings.postId
+                    parent:  media.view.settings.postId,
+                    orderby: 'menuOrder',
+                    order:   'ASC'
                 },
                 priority: 20
@@ -2922 +2926 @@
                     text: text,
                     props: {
-                        type:   key,
-                        parent: null
+                        type:    key,
+                        parent:  null,
+                        orderby: 'date',
+                        order:   'DESC'
                     }
                 };
@@ -2931 +2937 @@
                 text:  l10n.allMediaItems,
                 props: {
-                    type:   null,
-                    parent: null
+                    type:    null,
+                    parent:  null,
+                    orderby: 'date',
+                    order:   'DESC'
                 },
                 priority: 10
@@ -2940 +2948 @@
                 text:  l10n.uploadedToThisPost,
                 props: {
-                    type:   null,
-                    parent: media.view.settings.postId
+                    type:    null,
+                    parent:  media.view.settings.postId,
+                    orderby: 'menuOrder',
+                    order:   'ASC'
                 },
                 priority: 20

trunk/wp-includes/media.php

@@ -1255 +1255 @@
         'urlstream_upload'    => true,
     );
-    
+
     // Multi-file uploading doesn't currently work in iOS Safari,
     // single-file allows the built-in camera to be used as source for images
@@ -1328 +1328 @@
         'date'        => strtotime( $attachment->post_date_gmt ) * 1000,
         'modified'    => strtotime( $attachment->post_modified_gmt ) * 1000,
+        'menuOrder'   => $attachment->menu_order,
         'mime'        => $attachment->post_mime_type,
         'type'        => $type,