Update vendors.

Former-commit-id: 1e711564671134b82eed980bccb628af612ae195

vendor/backbone/backbone.js

@@ -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.

vendor/backbone/test/view.js

@@ -7,17 +7,20 @@ $(document).ready(function() {
     setup: function() {
       view = new Backbone.View({
         id        : 'test-view',
-        className : 'test-view'
+        className : 'test-view',
+        other     : 'non-special-option'
       });
     }
 
   });
 
-  test("constructor", 4, function() {
+  test("constructor", 6, function() {
     equal(view.el.id, 'test-view');
     equal(view.el.className, 'test-view');
+    equal(view.el.other, void 0);
     equal(view.options.id, 'test-view');
     equal(view.options.className, 'test-view');
+    equal(view.options.other, 'non-special-option');
   });
 
   test("jQuery", 1, function() {