Changeset 23057

Timestamp:

12/05/2012 02:31:41 AM (12 years ago)

Author:

nacin

Message:

Media models: Trac and ignore deleted attachments.

Treat an admin-ajax response of 1 as successful for backwards compatibility with existing handlers.

props koopersmith. fixes #22750.

File:

• trunk/wp-includes/js/media-models.js (modified) (4 diffs)

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

@@ -143 +143 @@
                 // Use with PHP's wp_send_json_success() and wp_send_json_error()
                 $.ajax( options ).done( function( response ) {
+                    // Treat a response of `1` as successful for backwards
+                    // compatibility with existing handlers.
+                    if ( response === '1' || response === 1 )
+                        response = { success: true };
+
                     if ( _.isObject( response ) && ! _.isUndefined( response.success ) )
                         deferred[ response.success ? 'resolveWith' : 'rejectWith' ]( this, [response.data] );
@@ -265 +270 @@
             } else if ( 'delete' === method ) {
                 options = options || {};
+
+                if ( ! options.wait )
+                    this.destroyed = true;
+
                 options.context = this;
                 options.data = _.extend( options.data || {}, {
@@ -271 +280 @@
                     _wpnonce: this.get('nonces')['delete']
                 });
-                return media.ajax( options );
+
+                return media.ajax( options ).done( function() {
+                    this.destroyed = true;
+                }).fail( function() {
+                    this.destroyed = false;
+                });
             }
         },
@@ -402 +416 @@
         },
 
+        validateDestroyed: false,
+
         validator: function( attachment ) {
+            if ( ! this.validateDestroyed && attachment.destroyed )
+                return false;
             return _.all( this.filters, function( filter, key ) {
                 return !! filter.call( this, attachment );