Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-09 18:37:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update vendors.

Browse Source 
Former-commit-id: 1e711564671134b82eed980bccb628af612ae195
This commit is contained in:
John-David Dalton
2012-10-23 00:36:59 -07:00
parent 974678f500
commit 442f51224d
8 changed files with 152 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vendor/backbone/backbone.js vendored
View File

@@ -62,7 +62,7 @@
Backbone.emulateJSON = false;
// Backbone.Events
// -----------------
// ---------------
// Regular expression used to split event strings
var eventSplitter = /\s+/;
@@ -892,7 +892,7 @@
});
// Backbone.Router
// -------------------
// ---------------
// Routers map faux-URLs to actions, and fire events when routes are
// matched. Creating a new one sets its `routes` hash, if not set statically.
@@ -1313,10 +1313,7 @@
// attached directly to the view.
_configure: function(options) {
if (this.options) options = _.extend({}, this.options, options);
for (var i = 0, l = viewOptions.length; i < l; i++) {
var attr = viewOptions[i];
if (options[attr]) this[attr] = options[attr];
}
_.extend(this, _.pick(options, viewOptions));
this.options = options;
},
@@ -1466,7 +1463,7 @@
return child;
};
// Set up inheritance for the model, collection, router, and view.
// Set up inheritance for the model, collection, router, view and history.
Model.extend = Collection.extend = Router.extend = View.extend = History.extend = extend;
// Throw an error when a URL is needed, and none is supplied.