Changeset 22713

Timestamp:

11/20/2012 02:04:59 PM (14 years ago)

Author:

koopersmith

Message:

Media: Allow all galleries to be sortable. fixes #22488, see #21390.

Location:

trunk

Files:

• wp-admin/js/media-upload.js (modified) (1 diff)
• wp-includes/js/media-views.js (modified) (3 diffs)

trunk/wp-admin/js/media-upload.js

@@ -321 +321 @@
                                 selection.gallery = attachments.gallery;
 
+                                // Fetch the query's attachments, and then break ties from the
+                                // query to allow for sorting.
+                                selection.more().done( function() {
+                                        // Break ties with the query.
+                                        selection.props.set({ query: false });
+                                        selection.unmirror();
+                                        selection.props.unset('orderby');
+                                });
+
                                 return wp.media({
                                         frame:     'post',

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

@@ -2541 +2541 @@
 
                         this.initSortable();
+                        this.collection.props.on( 'change:orderby', this.refreshSortable, this );
 
                         _.bindAll( this, 'css' );
@@ -2550 +2551 @@
 
                 destroy: function() {
+                        this.collection.props.off( null, null, this );
                         this.collection.off( 'add remove reset', null, this );
                         this.model.off( 'change:edge change:gutter', this.css, this );
@@ -2627 +2629 @@
                                 this.$el.sortable( 'option', 'disabled', !! collection.comparator );
                         }, this );
+                },
+
+                refreshSortable: function() {
+                        if ( ! this.options.sortable || ! $.fn.sortable )
+                                return;
+
+                        // If the `collection` has a `comparator`, disable sorting.
+                        this.$el.sortable( 'option', 'disabled', !! this.collection.comparator );
                 },