Ticket #24753: 24753.diff

wp-includes/js/media-models.js

@@ -1 +1 @@
 window.wp = window.wp || {};
 
 (function($){
-        var Attachment, Attachments, Query, compare, l10n, media, bindSyncEvents;
+        var Attachment, Attachments, Query, compare, l10n, media;
 
         /**
          * wp.media( attributes )
@@ -67 +67 @@
                         return a > b ? -1 : 1;
         };
 
-        // Ensures the 'sync' and 'error' events are always
-        // correctly triggered when overloading `Backbone.sync`.
-        bindSyncEvents = function( model, options ) {
-                var success = options.success,
-                        error = options.error;
-
-                options.success = function( resp ) {
-                        if ( success )
-                                success( resp );
-                        model.trigger( 'sync', model, resp, options );
-                };
-
-                options.error = function( xhr ) {
-                        if ( error )
-                                error( xhr );
-                        model.trigger( 'error', model, xhr, options );
-                };
-
-                return options;
-        };
-
         _.extend( media, {
                 /**
                  * media.template( id )
@@ -197 +176 @@
                                         action: 'get-attachment',
                                         id: this.id
                                 });
-                                bindSyncEvents( model, options );
                                 return media.ajax( options );
 
                         // Overload the `update` request so properties can be saved.
@@ -226 +204 @@
                                         }, this );
                                 }
 
-                                bindSyncEvents( model, options );
                                 return media.ajax( options );
 
                         // Overload the `delete` request so attachments can be removed.
@@ -244 +221 @@
                                         _wpnonce: this.get('nonces')['delete']
                                 });
 
-                                bindSyncEvents( model, options );
                                 return media.ajax( options ).done( function() {
                                         this.destroyed = true;
                                 }).fail( function() {
@@ -506 +482 @@
                         return this.mirroring ? this.mirroring.hasMore() : false;
                 },
 
+                parse: function( resp, xhr ) {
+                        if (! _.isArray(resp))
+                                resp = [resp];
+
+                        return _.map( resp, function( attrs ) {
+                                if (attrs instanceof Backbone.Model )
+                                        return attrs;
+
+                                var attachment = Attachment.get( attrs.id );
+                                return attachment.set( attachment.parse( attrs, xhr ) );
+                        });
+                },
+
                 _requery: function() {
                         if ( this.props.get('query') )
                                 this.mirror( Query.get( this.props.toJSON() ) );
@@ -701 +690 @@
                                         args.paged = Math.floor( this.length / args.posts_per_page ) + 1;
 
                                 options.data.query = args;
-                                bindSyncEvents( model, options );
                                 return media.ajax( options );
 
                         // Otherwise, fall back to Backbone.sync()