Changeset 31039

Timestamp:

01/03/2015 09:31:23 PM (10 years ago)

Author:

wonderboymusic

Message:

In Media Grid, don't immediately load full size images if the requested size passed to wp.media.view.Attachment.imageSize() does not exist, look for other suitable sizes.

Fixes #30861.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (1 diff)

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

@@ -5431 +5431 @@
          */
         imageSize: function( size ) {
-            var sizes = this.model.get('sizes');
+            var sizes = this.model.get('sizes'), matched = false;
 
             size = size || 'medium';
 
             // Use the provided image size if possible.
-            if ( sizes && sizes[ size ] ) {
-                return _.clone( sizes[ size ] );
-            } else {
-                return {
-                    url:         this.model.get('url'),
-                    width:       this.model.get('width'),
-                    height:      this.model.get('height'),
-                    orientation: this.model.get('orientation')
-                };
-            }
+            if ( sizes ) {
+                if ( sizes[ size ] ) {
+                    matched = sizes[ size ];
+                } else if ( sizes.large ) {
+                    matched = sizes.large;
+                } else if ( sizes.thumbnail ) {
+                    matched = sizes.thumbnail;
+                } else if ( sizes.full ) {
+                    matched = sizes.full;
+                }
+
+                if ( matched ) {
+                    return _.clone( matched );
+                }
+            }
+
+            return {
+                url:         this.model.get('url'),
+                width:       this.model.get('width'),
+                height:      this.model.get('height'),
+                orientation: this.model.get('orientation')
+            };
         },
         /**