Changeset 22737

Timestamp:

11/21/2012 08:09:28 AM (14 years ago)

Author:

koopersmith

Message:

Media: Prevent type and search attachments filters from short circuiting.

Moves the reference to the source collection out of the props model. If it was translated over to a query (which was potentially possible) which then fired an ajax request, jQuery would attempt to serialize an object recursively, which caused an infinite loop and much sadness for my browser.

see #21390.

File:

• trunk/wp-includes/js/media-models.js (modified) (2 diffs)

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

@@ -326 +326 @@
 
                 _changeFilteredProp: function( prop, model, term ) {
-                        // Bail if we're currently searching for the same term.
-                        if ( this.props.get( prop ) === term )
+                        // If this is a query, updating the collection will be handled by
+                        // `this._requery()`.
+                        if ( this.props.get('query') )
                                 return;
 
@@ -338 +339 @@
                         // from, then automatically generate a source from the existing
                         // models.
-                        if ( ! this.props.get('source') )
-                                this.props.set( 'source', new Attachments( this.models ) );
-
-                        this.reset( this.props.get('source').filter( this.validator ) );
+                        if ( ! this._source )
+                                this._source = new Attachments( this.models );
+
+                        this.reset( this._source.filter( this.validator, this ) );
                 },