Changeset 22746

Timestamp:

11/21/2012 11:35:30 AM (12 years ago)

Author:

koopersmith

Message:

Media: Make mirroring a collection of attachments a special case of observing a collection of attachments. see #21390.

File:

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

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

@@ -363 +363 @@
                 hasAttachment = !! this.getByCid( attachment.cid );
 
-            // Only retain the `silent` option.
-            options = {
-                silent: options && options.silent
-            };
-
             if ( ! valid && hasAttachment )
                 this.remove( attachment, options );
@@ -376 +371 @@
         },
 
-        validateAll: function( attachments ) {
+        validateAll: function( attachments, options ) {
+            options = options || {};
+
             _.each( attachments.models, function( attachment ) {
                 this.validate( attachment, { silent: true });
             }, this );
+
+            if ( ! options.silent )
+                this.trigger( 'reset', this, options );
 
             return this;
@@ -411 +411 @@
 
         _validateHandler: function( attachment, attachments, options ) {
+            // If we're not mirroring this `attachments` collection,
+            // only retain the `silent` option.
+            options = attachments === this.mirroring ? options : {
+                silent: options && options.silent
+            };
+
             return this.validate( attachment, options );
         },
@@ -424 +430 @@
             this.unmirror();
             this.mirroring = attachments;
-            this.reset( attachments.models );
-            attachments.on( 'add',    this._mirrorAdd,    this );
-            attachments.on( 'remove', this._mirrorRemove, this );
-            attachments.on( 'reset',  this._mirrorReset,  this );
+
+            // Clear the collection silently. A `reset` event will be fired
+            // when `observe()` calls `validateAll()`.
+            this.reset( [], { silent: true } );
+            this.observe( attachments );
         },
 
@@ -434 +441 @@
                 return;
 
-            this.mirroring.off( 'add',    this._mirrorAdd,    this );
-            this.mirroring.off( 'remove', this._mirrorRemove, this );
-            this.mirroring.off( 'reset',  this._mirrorReset,  this );
+            this.unobserve( this.mirroring );
             delete this.mirroring;
-        },
-
-        _mirrorAdd: function( attachment, attachments, options ) {
-            this.add( attachment, { at: options.index });
-        },
-
-        _mirrorRemove: function( attachment ) {
-            this.remove( attachment );
-        },
-
-        _mirrorReset: function( attachments ) {
-            this.reset( attachments.models );
         },