Changeset 22021

Timestamp:

09/26/2012 08:50:13 PM (12 years ago)

Author:

koopersmith

Message:

Media JS: Add support for filtering Attachment collections by mime type. see #21390, #21776, #21809.

Location:

trunk

Files:

• wp-admin/includes/ajax-actions.php (modified) (1 diff)
• wp-includes/js/media-models.js (modified) (5 diffs)

trunk/wp-admin/includes/ajax-actions.php

@@ -1803 +1803 @@
 function wp_ajax_query_attachments() {
     $query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
-    $query = array_intersect_key( $query, array_flip( array( 's', 'order', 'orderby', 'posts_per_page', 'paged' ) ) );
+    $query = array_intersect_key( $query, array_flip( array( 's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type' ) ) );
 
     $query['post_type'] = 'attachment';

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

@@ -225 +225 @@
             this.props.on( 'change:query',   this._changeQuery,   this );
             this.props.on( 'change:search',  this._changeSearch,  this );
+            this.props.on( 'change:type',    this._changeType,    this );
 
             // Set the `props` model and fill the default property values.
@@ -265 +266 @@
         },
 
-        _changeSearch: function( model, term ) {
+        _changeFilteredProp: function( prop, model, term ) {
             // Bail if we're currently searching for the same term.
-            if ( this.props.get('search') === term )
+            if ( this.props.get( prop ) === term )
                 return;
 
-            if ( term && ! this.filters.search )
-                this.filters.search = Attachments.filters.search;
-            else if ( ! term && this.filters.search === Attachments.filters.search )
-                delete this.filters.search;
+            if ( term && ! this.filters[ prop ] )
+                this.filters[ prop ] = Attachments.filters[ prop ];
+            else if ( ! term && this.filters[ prop ] === Attachments.filters[ prop ] )
+                delete this.filters[ prop ];
 
             // If no `Attachments` model is provided to source the searches
@@ -282 +283 @@
 
             this.reset( this.props.get('source').filter( this.validator ) );
+        },
+
+        _changeSearch: function( model, term ) {
+            return this._changeFilteredProp( 'search', model, term );
+        },
+
+        _changeType: function( model, term ) {
+            return this._changeFilteredProp( 'type', model, term );
         },
 
@@ -381 +390 @@
                     return value && -1 !== value.search( this.props.get('search') );
                 }, this );
+            },
+
+            type: function( attachment ) {
+                var type = this.props.get('type');
+                if ( ! type )
+                    return true;
+
+                return -1 !== type.indexOf( attachment.get('type') );
             }
         }
@@ -498 +515 @@
 
         propmap: {
-            'search': 's'
+            'search': 's',
+            'type':   'post_mime_type'
         },