Update vendors.

Former-commit-id: e109c9ffd436610d066493b07bd38293e1ec01a7
This commit is contained in:
John-David Dalton
2012-11-19 20:54:23 -08:00
parent 4a99c2e928
commit 2639cc6138
6 changed files with 45 additions and 5 deletions

View File

@@ -367,7 +367,7 @@
// If we're "wait"-ing to set changed attributes, validate early.
if (options.wait) {
if (!this._validate(attrs, options)) return false;
if (attrs && !this._validate(attrs, options)) return false;
current = _.clone(this.attributes);
}
@@ -1204,7 +1204,7 @@
var delegateEventSplitter = /^(\S+)\s*(.*)$/;
// List of view options to be merged as properties.
var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName'];
var viewOptions = ['model', 'collection', 'el', 'id', 'attributes', 'className', 'tagName', 'events'];
// Set up all inheritable **Backbone.View** properties and methods.
_.extend(View.prototype, Events, {