Changeset 33091

Timestamp:

07/06/2015 03:33:53 PM (9 years ago)

Author:

wonderboymusic

Message:

In wp.media.model.Attachments.filters.type(), return true earlier if type isn't set.

Props vivekbhusal.
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

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

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

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