Changeset 22750

Timestamp:

11/21/2012 12:11:38 PM (14 years ago)

Author:

koopersmith

Message:

Media: Remove redundant code.

Make the composite gallery library use mirror instead of observe, as one method now invokes the other. Also, make mirror return the attachment collection for chaining.

see #21390.

Location:

trunk/wp-includes/js

Files:

• media-models.js (modified) (1 diff)
• media-views.js (modified) (1 diff)

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

@@ -435 +435 @@
                         this.reset( [], { silent: true } );
                         this.observe( attachments );
+
+                        return this;
                 },
 

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

@@ -404 +404 @@
                         };
 
-                        composite.observe( original ).observe( exclude );
-
-                        // When `more()` is triggered on the composite collection,
-                        // pass the command over to the `original`, which will
-                        // populate the query.
-                        composite.more = _.bind( original.more, original );
+                        composite.mirror( original ).observe( exclude );
 
                         this.set( 'library', composite );