Changeset 22558

Timestamp:

11/13/2012 03:33:41 AM (12 years ago)

Author:

koopersmith

Message:

Media: Better image detection in the embed from URL tab. see #21390.

File:

• trunk/wp-includes/js/media-views.js (modified) (2 diffs)

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

@@ -543 +543 @@
         },
 
-        initialize: function() {
-            this.on( 'change:url', this.scan, this );
+        // The amount of time used when debouncing the scan.
+        sensitivity: 200,
+
+        initialize: function() {
+            this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity );
+            this.on( 'change:url', this.debouncedScan, this );
+            this.on( 'scan', this.scanImage, this );
             media.controller.State.prototype.initialize.apply( this, arguments );
         },
@@ -551 +556 @@
             var attributes = { type: 'link' };
 
-            if ( /(?:jpe?g|png|gif)$/i.test( this.get('url') ) )
-                attributes.type = 'image';
-
             this.trigger( 'scan', attributes );
             this.set( attributes );
+        },
+
+        scanImage: function( attributes ) {
+            var frame = this.frame,
+                state = this,
+                url = this.get('url'),
+                image = new Image();
+
+            image.onload = function() {
+                if ( state === frame.state() && url === state.get('url') )
+                    state.set( 'type', 'image' );
+            };
+
+            image.src = url;
         },