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

Media: Make mirroring a collection of attachments a special case of observing a collection of attachments. see #21390. 

git-svn-id: http://core.svn.wordpress.org/trunk@22746 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Daryl Koopersmith 2012-11-21 11:35:30 +00:00
parent ff482e86fb
commit ff1707892d
1 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -362,11 +362,6 @@ window.wp = window.wp || {};
var valid = this.validator( attachment ),
hasAttachment = !! this.getByCid( attachment.cid );
// Only retain the `silent` option.
options = {
silent: options && options.silent
};
if ( ! valid && hasAttachment )
this.remove( attachment, options );
else if ( valid && ! hasAttachment )
@ -375,11 +370,16 @@ window.wp = window.wp || {};
return this;
},
validateAll: function( attachments ) {
validateAll: function( attachments, options ) {
options = options || {};
_.each( attachments.models, function( attachment ) {
this.validate( attachment, { silent: true });
}, this );
if ( ! options.silent )
this.trigger( 'reset', this, options );
return this;
},
@ -410,6 +410,12 @@ window.wp = window.wp || {};
},
_validateHandler: function( attachment, attachments, options ) {
// If we're not mirroring this `attachments` collection,
// only retain the `silent` option.
options = attachments === this.mirroring ? options : {
silent: options && options.silent
};
return this.validate( attachment, options );
},
@ -423,34 +429,21 @@ window.wp = window.wp || {};
this.unmirror();
this.mirroring = attachments;
this.reset( attachments.models );
attachments.on( 'add', this._mirrorAdd, this );
attachments.on( 'remove', this._mirrorRemove, this );
attachments.on( 'reset', this._mirrorReset, this );
// Clear the collection silently. A `reset` event will be fired
// when `observe()` calls `validateAll()`.
this.reset( [], { silent: true } );
this.observe( attachments );
},
unmirror: function() {
if ( ! this.mirroring )
return;
this.mirroring.off( 'add', this._mirrorAdd, this );
this.mirroring.off( 'remove', this._mirrorRemove, this );
this.mirroring.off( 'reset', this._mirrorReset, this );
this.unobserve( this.mirroring );
delete this.mirroring;
},
_mirrorAdd: function( attachment, attachments, options ) {
this.add( attachment, { at: options.index });
},
_mirrorRemove: function( attachment ) {
this.remove( attachment );
},
_mirrorReset: function( attachments ) {
this.reset( attachments.models );
},
more: function( options ) {
if ( this.mirroring && this.mirroring.more )
return this.mirroring.more( options );