Ticket #32746: 32746.patch

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

@@ -491 +491 @@
                  * @returns {Boolean}
                  */
                 type: function( attachment ) {
-                        var type = this.props.get('type'), atts = attachment.toJSON(), mime, found;
+                        // Return of the type is not defined
+            if( ! this.props.get("type") ) {
+                return true;
+            }
 
-                        mime = atts.mime || ( atts.file && atts.file.type ) || '';
+            var type = this.props.get('type'),
+                attachmentType = attachment.get("type"), found;
 
-                        if ( _.isArray( type ) ) {
-                                found = ! type.length || _.find( type, function (t) {
-                                        return -1 !== mime.indexOf( t );
-                                } );
-                        } else {
-                                found = ! type || -1 !== mime.indexOf( type );
-                        }
+            //Chek if the define mime type is array. 
+            //If yes, loop though each and compare
+            if ( _.isArray( type ) ) {
+                found = _.find( type, function (t) {
+                        return -1 !== t.indexOf( attachmentType );
+                } );
+            } else {
+                found = -1 !== type.indexOf( attachmentType );
+            }
 
-                        return found;
-                },
+            return found;
+
+        },
                 /**
                  * @static
                  * @param {wp.media.model.Attachment} attachment

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

@@ -895 +895 @@
                  * @returns {Boolean}
                  */
                 type: function( attachment ) {
-                        var type = this.props.get('type'), atts = attachment.toJSON(), mime, found;
+            // Return of the type is not defined
+            if( ! this.props.get("type") ) {
+                return true;
+            }
 
-                        mime = atts.mime || ( atts.file && atts.file.type ) || '';
+            var type = this.props.get('type'),
+                attachmentType = attachment.get("type"), found;
 
-                        if ( _.isArray( type ) ) {
-                                found = ! type.length || _.find( type, function (t) {
-                                        return -1 !== mime.indexOf( t );
-                                } );
-                        } else {
-                                found = ! type || -1 !== mime.indexOf( type );
-                        }
+            //Chek if the define mime type is array. 
+            //If yes, loop though each and compare
+            if ( _.isArray( type ) ) {
+                found = _.find( type, function (t) {
+                        return -1 !== t.indexOf( attachmentType );
+                } );
+            } else {
+                found = -1 !== type.indexOf( attachmentType );
+            }
 
-                        return found;
-                },
+            return found;
+
+        },
                 /**
                  * @static
                  * @param {wp.media.model.Attachment} attachment