Changeset 36166 for trunk

Timestamp:

01/04/2016 12:32:56 AM (9 years ago)

Author:

azaozz

Message:

Media: when inserting an attachment in the editor and it is not an image, ensure the link is set to something else than none.

Props eherman24, azaozz.
Fizes #35153 for trunk.

Location:

trunk/src/wp-includes/js

Files:

• media-views.js (modified) (1 diff)
• media/controllers/library.js (modified) (1 diff)

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

@@ -1215 +1215 @@
      */
     defaultDisplaySettings: function( attachment ) {
-        var settings = this._defaultDisplaySettings;
+        var settings = _.clone( this._defaultDisplaySettings );
+
         if ( settings.canEmbed = this.canEmbed( attachment ) ) {
             settings.link = 'embed';
-        }
+        } else if ( ! this.isImageAttachment( attachment ) && settings.link === 'none' ) {
+            settings.link = 'file';
+        }
+
         return settings;
+    },
+
+    /**
+     * Whether an attachment is image.
+     *
+     * @since 4.4.1
+     *
+     * @param {wp.media.model.Attachment} attachment
+     * @returns {Boolean}
+     */
+    isImageAttachment: function( attachment ) {
+        // If uploading, we know the filename but not the mime type.
+        if ( attachment.get('uploading') ) {
+            return /\.(jpe?g|png|gif)$/i.test( attachment.get('filename') );
+        }
+
+        return attachment.get('type') === 'image';
     },
 

trunk/src/wp-includes/js/media/controllers/library.js

@@ -172 +172 @@
      */
     defaultDisplaySettings: function( attachment ) {
-        var settings = this._defaultDisplaySettings;
+        var settings = _.clone( this._defaultDisplaySettings );
+
         if ( settings.canEmbed = this.canEmbed( attachment ) ) {
             settings.link = 'embed';
-        }
+        } else if ( ! this.isImageAttachment( attachment ) && settings.link === 'none' ) {
+            settings.link = 'file';
+        }
+
         return settings;
+    },
+
+    /**
+     * Whether an attachment is image.
+     *
+     * @since 4.4.1
+     *
+     * @param {wp.media.model.Attachment} attachment
+     * @returns {Boolean}
+     */
+    isImageAttachment: function( attachment ) {
+        // If uploading, we know the filename but not the mime type.
+        if ( attachment.get('uploading') ) {
+            return /\.(jpe?g|png|gif)$/i.test( attachment.get('filename') );
+        }
+
+        return attachment.get('type') === 'image';
     },