Changeset 22655

Timestamp:

11/19/2012 02:43:10 AM (14 years ago)

Author:

koopersmith

Message:

Media: Optimize media models.

• Merge Composite model with general Attachments model, as Attachments.validate and Composite.evaluate were functionally equivalent.
• Queries should only watch wp.Uploader.queue, as watching Attachments.all results in queries attempting to add attachments before their properties are set (which then results a few too many irrelevant adds/removes). Attachments.all should potentially be removed or rethought.

see #21390.

Location:

trunk/wp-includes/js

Files:

• media-models.js (modified) (5 diffs)
• media-views.js (modified) (2 diffs)

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

@@ -359 +359 @@
 
                 validate: function( attachment, options ) {
+                        var valid = this.validator( attachment ),
+                                hasAttachment = !! this.getByCid( attachment.cid );
+
                         // Only retain the `silent` option.
                         options = {
@@ -364 +367 @@
                         };
 
-                        return this[ this.validator( attachment ) ? 'add' : 'remove' ]( attachment, options );
+                        if ( ! valid && hasAttachment )
+                                this.remove( attachment, options );
+                        else if ( valid && ! hasAttachment )
+                                this.add( attachment, options );
+
+                        return this;
+                },
+
+                validateAll: function( attachments ) {
+                        _.each( attachments.models, function( attachment ) {
+                                this.validate( attachment, { silent: true });
+                        }, this );
+
+                        return this;
                 },
 
                 observe: function( attachments ) {
-                        attachments.on( 'add change', this.validate, this );
+                        this.observers = this.observers || [];
+                        this.observers.push( attachments );
+
+                        attachments.on( 'add change remove', this._validateHandler, this );
+                        attachments.on( 'reset', this._validateAllHandler, this );
+
+                        this.validateAll( attachments );
+                        return this;
                 },
 
                 unobserve: function( attachments ) {
-                        attachments.off( 'add change', this.validate, this );
+                        if ( attachments ) {
+                                attachments.off( null, null, this );
+                                this.observers = _.without( this.observers, attachments );
+
+                        } else {
+                                _.each( this.observers, function( attachments ) {
+                                        attachments.off( null, null, this );
+                                }, this );
+                                delete this.observers;
+                        }
+
+                        return this;
+                },
+
+                _validateHandler: function( attachment, attachments, options ) {
+                        return this.validate( attachment, options );
+                },
+
+                _validateAllHandler: function( attachments, options ) {
+                        return this.evaluateAll( attachments, options );
                 },
 
@@ -519 +561 @@
                         };
 
-                        // Observe the central `Attachments.all` model to watch for new
-                        // matches for the query.
+                        // Observe the central `wp.Uploader.queue` collection to watch for
+                        // new matches for the query.
                         //
                         // Only observe when a limited number of query args are set. There
@@ -526 +568 @@
                         // false positives in those queries.
                         allowed = [ 's', 'order', 'orderby', 'posts_per_page', 'post_mime_type' ];
-                        if ( _( this.args ).chain().keys().difference( allowed ).isEmpty().value() )
-                                this.observe( Attachments.all );
+                        if ( wp.Uploader && _( this.args ).chain().keys().difference( allowed ).isEmpty().value() )
+                                this.observe( wp.Uploader.queue );
                 },
 
@@ -733 +775 @@
         });
 
-        /**
-         * wp.media.model.Composite
-         *
-         * Creates a model that can simultaneously pull from two or more collections.
-         */
-        media.model.Composite = Attachments.extend({
-                initialize: function( models, options ) {
-                        this.observe( this, { silent: true });
-                        Attachments.prototype.initialize.apply( this, arguments );
-                },
-
-                evaluate: function( attachment, options ) {
-                        var valid = this.validator( attachment ),
-                                hasAttachment = !! this.getByCid( attachment.cid );
-
-                        if ( ! valid && hasAttachment )
-                                this.remove( attachment, options );
-                        else if ( valid && ! hasAttachment )
-                                this.add( attachment, options );
-
-                        return this;
-                },
-
-                validator: function() {
-                        return true;
-                },
-
-                evaluateAll: function( attachments, options ) {
-                        _.each( attachments.models, function( attachment ) {
-                                this.evaluate( attachment, { silent: true });
-                        }, this );
-
-                        return this;
-                },
-
-                observe: function( attachments, options ) {
-                        var silent = options && options.silent;
-                        this.observers = this.observers || [];
-                        this.observers.push( attachments );
-
-                        attachments.on( 'add remove',  silent ? this._evaluateSilentHandler : this._evaluateHandler, this );
-                        attachments.on( 'reset',  silent ? this._evaluateAllSilentHandler : this._evaluateAllHandler, this );
-
-                        this.evaluateAll( attachments, options );
-                        return this;
-                },
-
-                unobserve: function( attachments ) {
-                        if ( attachments ) {
-                                attachments.off( null, null, this );
-                                this.observers = _.without( this.observers, attachments );
-
-                        } else {
-                                _.each( this.observers, function( attachments ) {
-                                        attachments.off( null, null, this );
-                                }, this );
-                                delete this.observers;
-                        }
-
-                        return this;
-                },
-
-                _evaluateHandler: function( attachment, attachments, options ) {
-                        return this.evaluate( attachment, options );
-                },
-
-                _evaluateAllHandler: function( attachments, options ) {
-                        return this.evaluateAll( attachments, options );
-                },
-
-                _evaluateSilentHandler: function( attachment, attachments, options ) {
-                        return this.evaluate( attachment, _.defaults({ silent: true }, options ) );
-                },
-
-                _evaluateAllSilentHandler: function( attachments, options ) {
-                        return this.evaluateAll( attachments, _.defaults({ silent: true }, options ) );
-                }
-        });
-
 }(jQuery));

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

@@ -388 +388 @@
 
                         // Create a composite library in its place.
-                        composite = new media.model.Composite( null, {
+                        composite = new media.model.Attachments( null, {
                                 props: _.pick( original.props.toJSON(), 'order', 'orderby' )
                         });
@@ -2411 +2411 @@
                         _.each(['add','remove'], function( method ) {
                                 this.collection.on( method, function( attachment, attachments, options ) {
+                                        console.log( method, 'attachment', attachment.id, 'at', options.index );
                                         this[ method ]( attachment, options.index );
                                 }, this );