WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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

git-svn-id: http://core.svn.wordpress.org/trunk@24771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2013-07-22 22:24:33 +00:00
parent 7aee678e69
commit bbf338666e
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
wp-includes/js/media-models.js
View File

@ -1,7 +1,7 @@
window.wp = window.wp || {};
(function($){
var Attachment, Attachments, Query, compare, l10n, media, bindSyncEvents;
var Attachment, Attachments, Query, compare, l10n, media;
/**
* wp.media( attributes )
@ -67,27 +67,6 @@ window.wp = window.wp || {};
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,7 +176,6 @@ window.wp = window.wp || {};
action: 'get-attachment',
id: this.id
});
bindSyncEvents( model, options );
return media.ajax( options );
// Overload the `update` request so properties can be saved.
@ -226,7 +204,6 @@ window.wp = window.wp || {};
}, this );
}
bindSyncEvents( model, options );
return media.ajax( options );
// Overload the `delete` request so attachments can be removed.
@ -244,7 +221,6 @@ window.wp = window.wp || {};
_wpnonce: this.get('nonces')['delete']
});
bindSyncEvents( model, options );
return media.ajax( options ).done( function() {
this.destroyed = true;
}).fail( function() {
@ -506,6 +482,27 @@ window.wp = window.wp || {};
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;
});
},
_requery: function() {
if ( this.props.get('query') )
this.mirror( Query.get( this.props.toJSON() ) );
@ -701,7 +698,6 @@ window.wp = window.wp || {};
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()