Changeset 24771

Timestamp:

07/22/2013 10:24:33 PM (11 years ago)

Author:

markjaquith

Message:

Fix a media regression in [24110] that could cause duplicate models.

Props garyc40. Fixes #24753. See #24094, #23830.

File:

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

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

@@ -2 +2 @@
 
 (function($){
-    var Attachment, Attachments, Query, compare, l10n, media, bindSyncEvents;
+    var Attachment, Attachments, Query, compare, l10n, media;
 
     /**
@@ -68 +68 @@
     };
 
-    // 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, {
         /**
@@ -198 +177 @@
                     id: this.id
                 });
-                bindSyncEvents( model, options );
                 return media.ajax( options );
 
@@ -227 +205 @@
                 }
 
-                bindSyncEvents( model, options );
                 return media.ajax( options );
 
@@ -245 +222 @@
                 });
 
-                bindSyncEvents( model, options );
                 return media.ajax( options ).done( function() {
                     this.destroyed = true;
@@ -505 +481 @@
         hasMore: function() {
             return this.mirroring ? this.mirroring.hasMore() : false;
+        },
+
+        parse: function( resp, xhr ) {
+            if ( ! _.isArray( resp ) )
+                resp = [resp];
+
+            return _.map( resp, function( attrs ) {
+                var id, attachment;
+                if ( attrs instanceof Backbone.Model ) {
+                    id = attrs.get( 'id' );
+                    attrs = attrs.attributes;
+                } else {
+                    id = attrs.id;
+                }
+
+                attachment = Attachment.get( attrs.id );
+                if ( ! _.isEqual( attachment.attributes, attrs ) )
+                    attachment.set( attachment.parse( attrs, xhr ) );
+
+                return attachment;
+            });
         },
 
@@ -702 +699 @@
 
                 options.data.query = args;
-                bindSyncEvents( model, options );
                 return media.ajax( options );