Changeset 22951

Timestamp:

11/30/2012 03:11:44 PM (12 years ago)

Author:

ryan

Message:

Update the "Uploaded to this post" filter view when uploading new files.

• Add an Attachments collection filter for uploadedTo (post_parent).
• Correct an erroneous map from the non-existent parent prop to post_parent.
• Define default menuOrder and uploadedTo props for uploading attachments.
• Unify filterable props into a single method (improving validation performance for calls to set with multiple properties).

Props koopersmith
fixes #22654

Location:

trunk/wp-includes/js

Files:

• media-editor.js (modified) (2 diffs)
• media-models.js (modified) (11 diffs)
• media-views.js (modified) (5 diffs)
• plupload/wp-plupload.js (modified) (1 diff)

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

@@ -206 +206 @@
 
                 if ( ! args.post__in )
-                    args.parent = attrs.id;
+                    args.uploadedTo = attrs.id;
 
                 // Collect the attributes that were not included in `args`.
@@ -229 +229 @@
                 attrs.ids = attachments.pluck('id');
 
-                // Copy the `parent` post ID.
-                if ( props.parent )
-                    attrs.id = props.parent;
+                // Copy the `uploadedTo` post ID.
+                if ( props.uploadedTo )
+                    attrs.id = props.uploadedTo;
 
                 // If the `ids` attribute is set and `orderby` attribute

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

@@ -317 +317 @@
 
             // Bind default `change` events to the `props` model.
+            this.props.on( 'change', this._changeFilteredProps, this );
+
             this.props.on( 'change:order',   this._changeOrder,   this );
             this.props.on( 'change:orderby', this._changeOrderby, this );
             this.props.on( 'change:query',   this._changeQuery,   this );
-            this.props.on( 'change:search',  this._changeSearch,  this );
-            this.props.on( 'change:type',    this._changeType,    this );
 
             // Set the `props` model and fill the default property values.
@@ -360 +360 @@
         },
 
-        _changeFilteredProp: function( prop, model, term ) {
+        _changeFilteredProps: function( model, options ) {
             // If this is a query, updating the collection will be handled by
             // `this._requery()`.
@@ -366 +366 @@
                 return;
 
-            if ( term && ! this.filters[ prop ] )
-                this.filters[ prop ] = Attachments.filters[ prop ];
-            else if ( ! term && this.filters[ prop ] === Attachments.filters[ prop ] )
-                delete this.filters[ prop ];
+            var changed = _.chain( options.changes ).map( function( t, prop ) {
+                var filter = Attachments.filters[ prop ],
+                    term = model.get( prop );
+
+                if ( ! filter )
+                    return;
+
+                if ( term && ! this.filters[ prop ] )
+                    this.filters[ prop ] = filter;
+                else if ( ! term && this.filters[ prop ] === filter )
+                    delete this.filters[ prop ];
+                else
+                    return;
+
+                // Record the change.
+                return true;
+            }, this ).any().value();
+
+            if ( ! changed )
+                return;
 
             // If no `Attachments` model is provided to source the searches
@@ -378 +394 @@
 
             this.reset( this._source.filter( this.validator, this ) );
-        },
-
-        _changeSearch: function( model, term ) {
-            return this._changeFilteredProp( 'search', model, term );
-        },
-
-        _changeType: function( model, term ) {
-            return this._changeFilteredProp( 'type', model, term );
         },
 
@@ -500 +508 @@
         }
     }, {
-        comparator: function( a, b ) {
+        comparator: function( a, b, options ) {
             var key   = this.props.get('orderby'),
                 order = this.props.get('order') || 'DESC',
@@ -513 +521 @@
                 b = b || new Date();
             }
+
+            // If `options.ties` is set, don't enforce the `cid` tiebreaker.
+            if ( options && options.ties )
+                ac = bc = null;
 
             return ( 'DESC' === order ) ? compare( a, b, ac, bc ) : compare( b, a, bc, ac );
@@ -532 +544 @@
             type: function( attachment ) {
                 var type = this.props.get('type');
-                if ( ! type )
+                return ! type || -1 !== type.indexOf( attachment.get('type') );
+            },
+
+            uploadedTo: function( attachment ) {
+                var uploadedTo = this.props.get('uploadedTo');
+                if ( _.isUndefined( uploadedTo ) )
                     return true;
 
-                return -1 !== type.indexOf( attachment.get('type') );
+                return uploadedTo === attachment.get('uploadedTo');
             }
         }
@@ -572 +589 @@
 
             this.filters.order = function( attachment ) {
+                var orderby = this.props.get('orderby'),
+                    order = this.props.get('order');
+
                 if ( ! this.comparator )
                     return true;
@@ -579 +599 @@
                 // item, then we can't guarantee the set is complete.
                 if ( this.length ) {
-                    return 1 !== this.comparator( attachment, this.last() );
+                    return 1 !== this.comparator( attachment, this.last(), { ties: true });
 
                 // Handle the case where there are no items yet and
                 // we're sorting for recent items. In that case, we want
                 // changes that occurred after we created the query.
-                } else if ( 'DESC' === this.args.order && ( 'date' === this.args.orderby || 'modified' === this.args.orderby ) ) {
-                    return attachment.get( this.args.orderby ) >= this.created;
+                } else if ( 'DESC' === order && ( 'date' === orderby || 'modified' === orderby ) ) {
+                    return attachment.get( orderby ) >= this.created;
+
+                // If we're sorting by menu order and we have no items,
+                // accept any items that have the default menu order (0).
+                } else if ( 'ASC' === order && 'menuOrder' === orderby ) {
+                    return attachment.get( orderby ) === 0;
                 }
 
@@ -598 +623 @@
             // are no filters for other properties, so observing will result in
             // false positives in those queries.
-            allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type' ];
+            allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type', 'post_parent' ];
             if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() )
                 this.observe( wp.Uploader.queue );
@@ -671 +696 @@
             'search':    's',
             'type':      'post_mime_type',
-            'parent':    'post_parent',
             'perPage':   'posts_per_page',
-            'menuOrder': 'menu_order'
+            'menuOrder': 'menu_order',
+            'uploadedTo': 'post_parent'
         },
 

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

@@ -2921 +2921 @@
                 text:  l10n.allMediaItems,
                 props: {
-                    parent:  null,
+                    uploadedTo: null,
                     orderby: 'date',
                     order:   'DESC'
@@ -2931 +2931 @@
                 text:  l10n.uploadedToThisPost,
                 props: {
-                    parent:  media.view.settings.postId,
+                    uploadedTo: media.view.settings.postId,
                     orderby: 'menuOrder',
                     order:   'ASC'
@@ -2949 +2949 @@
                     props: {
                         type:    key,
-                        parent:  null,
+                        uploadedTo: null,
                         orderby: 'date',
                         order:   'DESC'
@@ -2960 +2960 @@
                 props: {
                     type:    null,
-                    parent:  null,
+                    uploadedTo: null,
                     orderby: 'date',
                     order:   'DESC'
@@ -2971 +2971 @@
                 props: {
                     type:    null,
-                    parent:  media.view.settings.postId,
+                    uploadedTo: media.view.settings.postId,
                     orderby: 'menuOrder',
                     order:   'ASC'

trunk/wp-includes/js/plupload/wp-plupload.js

@@ -156 +156 @@
                     uploading: true,
                     date:      new Date(),
-                    filename:  file.name
+                    filename:  file.name,
+                    menuOrder: 0,
+                    uploadedTo: media.model.settings.postId
                 }, _.pick( file, 'loaded', 'size', 'percent' ) );