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

Merge https://github.com/ptn/backbone

Browse Source
This commit is contained in:
Samuel Clay
2011-04-22 11:52:38 -04:00
parent 577758af89 0f118ecb6e
commit 0cc8cb0890
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backbone.js
View File

@@ -530,7 +530,7 @@
if (!(model instanceof Backbone.Model)) {
var attrs = model;
model = new this.model(null, {collection: coll});
if (!model.set(attrs)) return false;
if (!model.set(attrs, options)) return false;
} else {
model.collection = coll;
}

16
test/collection.js
View File

@@ -233,6 +233,22 @@ $(document).ready(function() {
equals(col.create({"foo":"bar"}),false);
});
test("Collection: a failing create runs the error callback", function() {
var ValidatingModel = Backbone.Model.extend({
validate: function(attrs) {
return "fail";
}
});
var ValidatingCollection = Backbone.Collection.extend({
model: ValidatingModel
});
var flag = false;
var callback = function(model, error) { flag = true; };
var col = new ValidatingCollection();
col.create({"foo":"bar"}, { error: callback });
equals(flag, true);
});
test("collection: initialize", function() {
var Collection = Backbone.Collection.extend({
initialize: function() {