Changeset 32460

Timestamp:

05/08/2015 07:15:34 PM (11 years ago)

Author:

wonderboymusic

Message:

When fetching in media/views/embed/link.js, call abort() on any existing XHRs.
Use $.ajax instead of wp.ajax.send() to allow this.
Pass this as context to the options to remove the need to bind callbacks.

Fixes #32035.

Location:

trunk/src/wp-includes/js

Files:

• media-views.js (modified) (2 diffs)
• media/views/embed/link.js (modified) (2 diffs)

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

@@ -4562 +4562 @@
                 }
 
+                if ( this.dfd && 'pending' === this.dfd.state() ) {
+                        this.dfd.abort();
+                }
+
                 embed = new wp.shortcode({
                         tag: 'embed',
@@ -4568 +4572 @@
                 });
 
-                wp.ajax.send( 'parse-embed', {
-                        data : {
+                this.dfd = $.ajax({
+                        type:    'POST',
+                        url:     wp.ajax.settings.url,
+                        context: this,
+                        data:    {
+                                action: 'parse-embed',
                                 post_ID: wp.media.view.settings.post.id,
                                 shortcode: embed.string()
                         }
-                } )
-                        .done( _.bind( this.renderoEmbed, this ) )
-                        .fail( _.bind( this.renderFail, this ) );
-        },
-
-        renderFail: function () {
+                })
+                        .done( this.renderoEmbed )
+                        .fail( this.renderFail );
+        },
+
+        renderFail: function ( response, status ) {
+                if ( 'abort' === status ) {
+                        return;
+                }
                 this.$( '.link-text' ).show();
         },
 
         renderoEmbed: function( response ) {
-                var html = ( response && response.body ) || '';
+                var html = ( response && response.data && response.data.body ) || '';
 
                 if ( html ) {

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

@@ -46 +46 @@
                 }
 
+                if ( this.dfd && 'pending' === this.dfd.state() ) {
+                        this.dfd.abort();
+                }
+
                 embed = new wp.shortcode({
                         tag: 'embed',
@@ -52 +56 @@
                 });
 
-                wp.ajax.send( 'parse-embed', {
-                        data : {
+                this.dfd = $.ajax({
+                        type:    'POST',
+                        url:     wp.ajax.settings.url,
+                        context: this,
+                        data:    {
+                                action: 'parse-embed',
                                 post_ID: wp.media.view.settings.post.id,
                                 shortcode: embed.string()
                         }
-                } )
-                        .done( _.bind( this.renderoEmbed, this ) )
-                        .fail( _.bind( this.renderFail, this ) );
+                })
+                        .done( this.renderoEmbed )
+                        .fail( this.renderFail );
         },
 
-        renderFail: function () {
+        renderFail: function ( response, status ) {
+                if ( 'abort' === status ) {
+                        return;
+                }
                 this.$( '.link-text' ).show();
         },
 
         renderoEmbed: function( response ) {
-                var html = ( response && response.body ) || '';
+                var html = ( response && response.data && response.data.body ) || '';
 
                 if ( html ) {