renkan: comparison server/php/basic/public_html/static/lib/backbone-relational/backbone-relational.js

Mercurial Mercurial > renkan / comparison

summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help

server/php/basic/public_html/static/lib/backbone-relational/backbone-relational.js

changeset 498	08d121184a38
parent 442	adb907bba956

equal deleted inserted replaced

-:3ba7920facf4
+:08d121184a38
 /* vim: set tabstop=4 softtabstop=4 shiftwidth=4 noexpandtab: */
 /**
-* Backbone-relational.js 0.9.0
+* Backbone-relational.js 0.10.0
 * (c) 2011-2014 Paul Uithol and contributors (https://github.com/PaulUithol/Backbone-relational/graphs/contributors)
 *
 * Backbone-relational may be freely distributed under the MIT license; see the accompanying LICENSE.txt.
 * For details and documentation: https://github.com/PaulUithol/Backbone-relational.
 * Depends on Backbone (and thus on Underscore as well): https://github.com/documentcloud/backbone.
 					if ( attributes instanceof this.relatedModel ) {
 						model = attributes;
 					}
 					else {
 						// If `merge` is true, update models here, instead of during update.
-						model = this.relatedModel.findOrCreate( attributes,
+						model = ( _.isObject( attributes ) && options.parse && this.relatedModel.prototype.parse ) ?
-							_.extend( { merge: true }, options, { create: this.options.createModels } )
+							this.relatedModel.prototype.parse( _.clone( attributes ), options ) : attributes;
-						);
 					}
 					model && toAdd.push( model );
 				}, this );
 				}
 				else {
 					related = this._prepareCollection();
 				}
-				// By now, both `merge` and `parse` will already have been executed for models if they were specified.
+				// By now, `parse` will already have been executed just above for models if specified.
-				// Disable them to prevent additional calls.
+				// Disable to prevent additional calls.
-				related.set( toAdd, _.defaults( { merge: false, parse: false }, options ) );
+				related.set( toAdd, _.defaults( { parse: false }, options ) );
 			}
 			// Remove entries from `keyIds` that were already part of the relation (and are thus 'unchanged')
 			this.keyIds = _.difference( this.keyIds, _.pluck( related.models, 'id' ) );
 		trigger: function( eventName ) {
 			if ( eventName.length > 5 && eventName.indexOf( 'change' ) === 0 ) {
 				var dit = this,
 					args = arguments;
-				if ( !Backbone.Relational.eventQueue.isLocked() ) {
+				if ( !Backbone.Relational.eventQueue.isBlocked() ) {
 					// If we're not in a more complicated nested scenario, fire the change event right away
 					Backbone.Model.prototype.trigger.apply( dit, args );
 				}
 				else {
 					Backbone.Relational.eventQueue.add( function() {
 						return model.fetch( opts );
 					}, this );
 				}
 			}
-			return $.when.apply( null, requests ).then(
+			return this.deferArray(requests).then(
 				function() {
 					return Backbone.Model.prototype.get.call( dit, attr );
 				}
 			);
+		},
+		deferArray: function(deferArray) {
+			return Backbone.$.when.apply(null, deferArray);
 		},
 		set: function( key, value, options ) {
 			Backbone.Relational.eventQueue.block();
 		 * @return {Backbone.RelationalModel}
 		 */
 		findOrCreate: function( attributes, options ) {
 			options || ( options = {} );
 			var parsedAttributes = ( _.isObject( attributes ) && options.parse && this.prototype.parse ) ?
-				this.prototype.parse( _.clone( attributes ) ) : attributes;
+				this.prototype.parse( _.clone( attributes ), options ) : attributes;
 			// If specified, use a custom `find` function to match up existing models to the given attributes.
 			// Otherwise, try to find an instance of 'this' model type in the store
 			var model = this.findModel( parsedAttributes );
 		return result;
 	};
 	/**
-	 * Override 'Backbone.Collection.remove' to trigger 'relational:remove'.
+	 * Override 'Backbone.Collection._removeModels' to trigger 'relational:remove'.
 	 */
-	var remove = Backbone.Collection.prototype.__remove = Backbone.Collection.prototype.remove;
+	var _removeModels = Backbone.Collection.prototype.___removeModels = Backbone.Collection.prototype._removeModels;
-	Backbone.Collection.prototype.remove = function( models, options ) {
+	Backbone.Collection.prototype._removeModels = function( models, options ) {
 		// Short-circuit if this Collection doesn't hold RelationalModels
 		if ( !( this.model.prototype instanceof Backbone.RelationalModel ) ) {
-			return remove.call( this, models, options );
+			return _removeModels.call( this, models, options );
 		}
-		var singular = !_.isArray( models ),
+		var toRemove = [];
-			toRemove = [];
-		models = singular ? ( models ? [ models ] : [] ) : _.clone( models );
-		options || ( options = {} );
 		//console.debug('calling remove on coll=%o; models=%o, options=%o', this, models, options );
 		_.each( models, function( model ) {
 			model = this.get( model ) || ( model && this.get( model.cid ) );
 			model && toRemove.push( model );
 		}, this );
-		var result = remove.call( this, singular ? ( toRemove.length ? toRemove[ 0 ] : null ) : toRemove, options );
+		var result = _removeModels.call( this, toRemove, options );
 		_.each( toRemove, function( model ) {
 			this.trigger( 'relational:remove', model, this, options );
 		}, this );

renkan