Changeset 22985

Timestamp:

12/03/2012 04:54:03 AM (12 years ago)

Author:

nacin

Message:

Media: Don't add menu_order to newly uploaded attachments, to match 3.4 behavior. Reverts a bit of [22967]. props koopersmith. fixes #22607.

File:

• trunk/wp-includes/js/media-views.js (modified) (3 diffs)

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

@@ -2814 +2814 @@
 
         initSortable: function() {
-            var view = this,
-                collection = this.collection,
+            var collection = this.collection,
                 from;
 
@@ -2861 +2860 @@
                     // If the collection is sorted by menu order,
                     // update the menu order.
-                    view.saveMenuOrder();
-
-                    // Make sure any menu-order-related callbacks are bound.
-                    view.refreshSortable();
+                    collection.saveMenuOrder();
                 }
             });
@@ -2885 +2881 @@
             var collection = this.collection,
                 orderby = collection.props.get('orderby'),
-                enabled = 'menuOrder' === orderby || ! collection.comparator,
-                hasMenuOrder;
+                enabled = 'menuOrder' === orderby || ! collection.comparator;
 
             this.$el.sortable( 'option', 'disabled', ! enabled );
-
-            // Check if any attachments have a specified menu order.
-            hasMenuOrder = this.collection.any( function( attachment ) {
-                return attachment.get('menuOrder');
-            });
-
-            // Always unbind the `saveMenuOrder` callback to prevent multiple
-            // callbacks stacking up.
-            this.collection.off( 'change:uploading', this.saveMenuOrder, this );
-
-            if ( hasMenuOrder )
-                this.collection.on( 'change:uploading', this.saveMenuOrder, this );
-
-        },
-
-        saveMenuOrder: function() {
-            this.collection.saveMenuOrder();
         },