Changeset 22041

Timestamp:

09/27/2012 05:52:42 AM (14 years ago)

Author:

koopersmith

Message:

When uploading files through the Plupload bridge, attempt to detect images on upload. see #21390.

File:

• trunk/wp-includes/js/plupload/wp-plupload.js (modified) (1 diff)

trunk/wp-includes/js/plupload/wp-plupload.js

@@ -143 +143 @@
                 this.uploader.bind( 'FilesAdded', function( up, files ) {
                         _.each( files, function( file ) {
-                                file.attachment = wp.media.model.Attachment.create( _.extend({
+                                var attributes, image;
+
+                                // Generate attributes for a new `Attachment` model.
+                                attributes = _.extend({
                                         file:      file,
                                         uploading: true,
                                         date:      new Date()
-                                }, _.pick( file, 'loaded', 'size', 'percent' ) ) );
+                                }, _.pick( file, 'loaded', 'size', 'percent' ) );
+
+                                // Handle early mime type scanning for images.
+                                image = /(?:jpe?g|png|gif)$/i.exec( file.name );
+
+                                // Did we find an image?
+                                if ( image ) {
+                                        attributes.type = 'image';
+
+                                        // `jpeg`, `png` and `gif` are valid subtypes.
+                                        // `jpg` is not, so map it to `jpeg`.
+                                        attributes.subtype = ( 'jpg' === image[0] ) ? 'jpeg' : image[0];
+                                }
+
+                                // Create the `Attachment`.
+                                file.attachment = wp.media.model.Attachment.create( attributes );
 
                                 Uploader.queue.add( file.attachment );