Update vendors, minified files, and docs.

Former-commit-id: 018dfcade1386aa84492f60c8404ea00c01cbe11

vendor/backbone/test/collection.js

@@ -542,8 +542,7 @@ $(document).ready(function() {
     equal(col.length, 0);
   });
 
-  test("#861, adding models to a collection which do not pass validation", 1, function() {
-    raises(function() {
+  test("#861, adding models to a collection which do not pass validation", 2, function() {
       var Model = Backbone.Model.extend({
         validate: function(attrs) {
           if (attrs.id == 3) return "id can't be 3";
@@ -554,26 +553,26 @@ $(document).ready(function() {
         model: Model
       });
 
-      var col = new Collection;
+      var collection = new Collection;
+      collection.on("error", function() { ok(true); });
 
-      col.add([{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6}]);
-    }, function(e) {
-      return e.message === "Can't add an invalid model to a collection";
-    });
+      collection.add([{id: 1}, {id: 2}, {id: 3}, {id: 4}, {id: 5}, {id: 6}]);
+      deepEqual(collection.pluck('id'), [1, 2, 4, 5, 6]);
   });
 
-  test("throwing during add leaves consistent state", 4, function() {
-    var col = new Backbone.Collection();
-    col.on('test', function() { ok(false); });
-    col.model = Backbone.Model.extend({
+  test("Invalid models are discarded.", 5, function() {
+    var collection = new Backbone.Collection;
+    collection.on('test', function() { ok(true); });
+    collection.model = Backbone.Model.extend({
       validate: function(attrs){ if (!attrs.valid) return 'invalid'; }
     });
-    var model = new col.model({id: 1, valid: true});
-    raises(function() { col.add([model, {id: 2}]); });
+    var model = new collection.model({id: 1, valid: true});
+    collection.add([model, {id: 2}]);;
     model.trigger('test');
-    ok(!col.getByCid(model.cid));
-    ok(!col.get(1));
-    equal(col.length, 0);
+    ok(collection.getByCid(model.cid));
+    ok(collection.get(1));
+    ok(!collection.get(2));
+    equal(collection.length, 1);
   });
 
   test("multiple copies of the same model", 3, function() {
@@ -716,4 +715,15 @@ $(document).ready(function() {
     this.ajaxSettings.success([model]);
   });
 
+  test("`sort` shouldn't always fire on `add`", 1, function() {
+    var c = new Backbone.Collection([{id: 1}, {id: 2}, {id: 3}], {
+      comparator: 'id'
+    });
+    c.sort = function(){ ok(true); };
+    c.add([]);
+    c.add({id: 1});
+    c.add([{id: 2}, {id: 3}]);
+    c.add({id: 4});
+  });
+
 });

vendor/backbone/test/model.js

@@ -903,4 +903,18 @@ $(document).ready(function() {
     expect(0);
   });
 
+  test("silent changes in last `change` event back to original does not trigger change", 2, function() {
+    var changes = [];
+    var model = new Backbone.Model();
+    model.on('change:a change:b change:c', function(model, val) { changes.push(val); });
+    model.on('change', function() {
+      model.set({a:'c'}, {silent:true});
+    });
+    model.set({a:'a'});
+    deepEqual(changes, ['a']);
+    model.set({a:'a'}, {silent:true});
+    model.change();
+    deepEqual(changes, ['a']);
+  });
+
 });

vendor/backbone/test/view.js

@@ -165,6 +165,30 @@ $(document).ready(function() {
     strictEqual(new View().el.id, 'id');
   });
 
+  test("with options function", 3, function() {
+    var View1 = Backbone.View.extend({
+      options: function() {
+        return {
+          title: 'title1',
+          acceptText: 'confirm'
+        }
+      }
+    });
+
+    var View2 = View1.extend({
+      options: function() {
+        return _.extend(View1.prototype.options.call(this), {
+          title: 'title2',
+          fixed: true
+        });
+      }
+    });
+
+    strictEqual(new View2().options.title, 'title2');
+    strictEqual(new View2().options.acceptText, 'confirm');
+    strictEqual(new View2().options.fixed, true);
+  });
+
   test("with attributes", 2, function() {
     var View = Backbone.View.extend({
       attributes: {