Changeset 21689

Timestamp:

08/31/2012 06:38:32 PM (14 years ago)

Author:

koopersmith

Message:

Media JS: Attachments collection API improvements.

Rename watch() and unwatch() to observe() and unobserve(), respectively, to avoid conflicts with Firefox's proprietary Object.prototype.watch method.

Rename validate() to validator(), and changed() to validate(), as the latter will be more frequently used, and better explains its purpose. Also, make the new validate() more concise.

see #21390.

File:

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

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

@@ -146 +146 @@
                         this.filters = options.filters || {};
 
-                        if ( options.watch )
-                                this.watch( options.watch );
+                        if ( options.observe )
+                                this.observe( options.observe );
 
                         if ( options.mirror )
@@ -153 +153 @@
                 },
 
-                validate: function( attachment ) {
+                validator: function( attachment ) {
                         return _.all( this.filters, function( filter ) {
                                 return !! filter.call( this, attachment );
@@ -159 +159 @@
                 },
 
-                changed: function( attachment, options ) {
-
-                        if ( this.validate( attachment ) )
-                                this.add( attachment );
-                        else
-                                this.remove( attachment );
-                        return this;
-                },
-
-                watch: function( attachments ) {
-                        attachments.on( 'add change', this.changed, this );
-                },
-
-                unwatch: function( attachments ) {
-                        attachments.off( 'add change', this.changed, this );
+                validate: function( attachment, options ) {
+                        return this[ this.validator( attachment ) ? 'add' : 'remove' ]( attachment, options );
+                },
+
+                observe: function( attachments ) {
+                        attachments.on( 'add change', this.validate, this );
+                },
+
+                unobserve: function( attachments ) {
+                        attachments.off( 'add change', this.validate, this );
                 },
 
@@ -319 +314 @@
                         }
 
-                        this.watch( Attachments.all );
+                        this.observe( Attachments.all );
                 },