Permalink
Browse files

options.silent respected in _prepareModel ... prepping for a 0.9.1

  • Loading branch information...
1 parent d187f7f commit 738e25dd4dfca85202dd95e876add43a882e9b77 @jashkenas jashkenas committed Feb 2, 2012
Showing with 218 additions and 194 deletions.
  1. +33 −31 backbone-min.js
  2. +4 −3 backbone.js
  3. +177 −156 docs/backbone.html
  4. +3 −3 index.html
  5. +1 −1 package.json
View
View
@@ -1,4 +1,5 @@
-// Backbone.js 0.9.0
+// Backbone.js 0.9.1
+
// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
// Backbone may be freely distributed under the MIT license.
// For all details and documentation:
@@ -31,7 +32,7 @@
}
// Current version of the library. Keep in sync with `package.json`.
- Backbone.VERSION = '0.9.0';
+ Backbone.VERSION = '0.9.1';
// Require Underscore, if we're on the server, and it's not already present.
var _ = root._;
@@ -673,7 +674,7 @@
var attrs = model;
options.collection = this;
model = new this.model(attrs, options);
- if (!model._validate(model.attributes, options)) model = false;
+ if (!options.silent && !model._validate(model.attributes, options)) model = false;
} else if (!model.collection) {
model.collection = this;
}
Oops, something went wrong. Retry.

0 comments on commit 738e25d

Please sign in to comment.