Changeset 32915

Timestamp:

06/23/2015 07:39:21 PM (11 years ago)

Author:

wonderboymusic

Message:

When filtering media by type in wp.media.model.Attachments.filters.type(), account for the library's type being an array of full mime-types.

Fixes #32746.

Location:

trunk/src/wp-includes/js

Files:

• media-models.js (modified) (1 diff)
• media/models/attachments.js (modified) (1 diff)

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

@@ -896 +896 @@
                  */
                 type: function( attachment ) {
-                        var type = this.props.get('type');
-                        return ! type || -1 !== type.indexOf( attachment.get('type') );
+                        var type = this.props.get('type'), atts = attachment.toJSON(), mime, found;
+
+                        mime = atts.mime || ( atts.file && atts.file.type ) || '';
+
+                        if ( _.isArray( type ) ) {
+                                found = _.find( type, function (t) {
+                                        return -1 !== mime.indexOf( t );
+                                } );
+                        } else {
+                                found = ! type || -1 !== mime.indexOf( type );
+                        }
+
+                        return found;
                 },
                 /**

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

@@ -492 +492 @@
                  */
                 type: function( attachment ) {
-                        var type = this.props.get('type');
-                        return ! type || -1 !== type.indexOf( attachment.get('type') );
+                        var type = this.props.get('type'), atts = attachment.toJSON(), mime, found;
+
+                        mime = atts.mime || ( atts.file && atts.file.type ) || '';
+
+                        if ( _.isArray( type ) ) {
+                                found = _.find( type, function (t) {
+                                        return -1 !== mime.indexOf( t );
+                                } );
+                        } else {
+                                found = ! type || -1 !== mime.indexOf( type );
+                        }
+
+                        return found;
                 },
                 /**