github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-04-30 03:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Really fix #1977 - models with default values merge properly

Browse Source
This commit is contained in:
Casey Foster
2012-12-19 09:08:52 -08:00
parent d55ab70bab
commit 5a3ec24cc9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
backbone.js
View File

@@ -240,7 +240,9 @@
this._changes = [];
if (options && options.collection) this.collection = options.collection;
if (options && options.parse) attrs = this.parse(attrs, options);
if (defaults = _.result(this, 'defaults')) _.defaults(attrs, defaults);
if (defaults = _.result(this, 'defaults')) {
attrs = _.defaults({}, attrs, defaults);
}
this.set(attrs, _.extend({silent: true}, options));
this._currentAttributes = _.clone(this.attributes);
this._previousAttributes = _.clone(this.attributes);
@@ -631,7 +633,7 @@
// Add a model, or list of models to the set. Pass **silent** to avoid
// firing the `add` event for every new model.
add: function(models, options) {
var i, args, length, model, existing, needsSort;
var i, args, length, model, attrs, existing, needsSort;
var at = options && options.at;
var sort = ((options && options.sort) == null ? true : options.sort);
models = _.isArray(models) ? models.slice() : [models];
@@ -639,8 +641,9 @@
// Turn bare objects into model references, and prevent invalid models
// from being added.
for (i = models.length - 1; i >= 0; i--) {
if(!(model = this._prepareModel(models[i], options))) {
this.trigger('invalid', this, models[i], options);
attrs = models[i];
if(!(model = this._prepareModel(attrs, options))) {
this.trigger('invalid', this, attrs, options);
models.splice(i, 1);
continue;
}
@@ -650,7 +653,7 @@
// optionally merge it into the existing model.
if (existing = this.get(model)) {
if (options && options.merge) {
existing.set(model.attributes, options);
existing.set(attrs != model ? attrs : model.attributes, options);
needsSort = sort;
}
models.splice(i, 1);