Update vendors, rebuild minified files, update docs/license.

Former-commit-id: 689793b6e5c4bbae917e726dc646902c697ce3a7

vendor/backbone/test/collection.js

@@ -18,17 +18,21 @@ $(document).ready(function() {
 
   }));
 
-  test("new and sort", 7, function() {
+  test("new and sort", 9, function() {
+    var counter = 0;
+    col.on('sort', function(){ counter++; });
     equal(col.first(), a, "a should be first");
     equal(col.last(), d, "d should be last");
     col.comparator = function(a, b) {
       return a.id > b.id ? -1 : 1;
     };
     col.sort();
+    equal(counter, 1);
     equal(col.first(), a, "a should be first");
     equal(col.last(), d, "d should be last");
     col.comparator = function(model) { return model.id; };
     col.sort();
+    equal(counter, 2);
     equal(col.first(), d, "d should be first");
     equal(col.last(), a, "a should be last");
     equal(col.length, 4);
@@ -58,10 +62,10 @@ $(document).ready(function() {
     strictEqual(collection.last().get('a'), 4);
   });
 
-  test("get, getByCid", 3, function() {
+  test("get", 3, function() {
     equal(col.get(0), d);
     equal(col.get(2), b);
-    equal(col.getByCid(col.first().cid), col.first());
+    equal(col.get(col.first().cid), col.first());
   });
 
   test("get with non-default ids", 2, function() {
@@ -304,13 +308,13 @@ $(document).ready(function() {
     var colE = new Backbone.Collection([e]);
     var colF = new Backbone.Collection([f]);
     ok(e != f);
-    ok(colE.length == 1);
-    ok(colF.length == 1);
+    ok(colE.length === 1);
+    ok(colF.length === 1);
     colE.remove(e);
     equal(passed, false);
-    ok(colE.length == 0);
+    ok(colE.length === 0);
     colF.remove(e);
-    ok(colF.length == 0);
+    ok(colF.length === 0);
     equal(passed, true);
   });
 
@@ -338,13 +342,13 @@ $(document).ready(function() {
     });
     equal(colE, e.collection);
     colF.remove(e);
-    ok(colF.length == 0);
-    ok(colE.length == 1);
+    ok(colF.length === 0);
+    ok(colE.length === 1);
     equal(counter, 1);
     equal(colE, e.collection);
     colE.remove(e);
     equal(null, e.collection);
-    ok(colE.length == 0);
+    ok(colE.length === 0);
     equal(counter, 2);
   });
 
@@ -354,8 +358,8 @@ $(document).ready(function() {
     var colE = new Backbone.Collection([e]);
     var colF = new Backbone.Collection([e]);
     e.destroy();
-    ok(colE.length == 0);
-    ok(colF.length == 0);
+    ok(colE.length === 0);
+    ok(colF.length === 0);
     equal(undefined, e.collection);
   });
 
@@ -365,8 +369,8 @@ $(document).ready(function() {
     var colE = new Backbone.Collection([e]);
     var colF = new Backbone.Collection([e]);
     e.destroy();
-    ok(colE.length == 0);
-    ok(colF.length == 0);
+    ok(colE.length === 0);
+    ok(colF.length === 0);
     equal(undefined, e.collection);
   });
 
@@ -542,7 +546,7 @@ $(document).ready(function() {
     equal(col.length, 0);
   });
 
-  test("#861, adding models to a collection which do not pass validation", 2, function() {
+  test("#861, adding models to a collection which do not pass validation", function() {
       var Model = Backbone.Model.extend({
         validate: function(attrs) {
           if (attrs.id == 3) return "id can't be 3";
@@ -567,9 +571,9 @@ $(document).ready(function() {
       validate: function(attrs){ if (!attrs.valid) return 'invalid'; }
     });
     var model = new collection.model({id: 1, valid: true});
-    collection.add([model, {id: 2}]);;
+    collection.add([model, {id: 2}]);
     model.trigger('test');
-    ok(collection.getByCid(model.cid));
+    ok(collection.get(model.cid));
     ok(collection.get(1));
     ok(!collection.get(2));
     equal(collection.length, 1);
@@ -726,4 +730,102 @@ $(document).ready(function() {
     c.add({id: 4});
   });
 
+  test("#1407 parse option on constructor parses collection and models", 2, function() {
+    var model = {
+      namespace : [{id: 1}, {id:2}]
+    };
+    var Collection = Backbone.Collection.extend({
+      model: Backbone.Model.extend({
+        parse: function(model) {
+          model.name = 'test';
+          return model;
+        }
+      }),
+      parse: function(model) {
+        return model.namespace;
+      }
+    });
+    var c = new Collection(model, {parse:true});
+
+    equal(c.length, 2);
+    equal(c.at(0).get('name'), 'test');
+  });
+
+  test("#1407 parse option on reset parses collection and models", 2, function() {
+    var model = {
+      namespace : [{id: 1}, {id:2}]
+    };
+    var Collection = Backbone.Collection.extend({
+      model: Backbone.Model.extend({
+        parse: function(model) {
+          model.name = 'test';
+          return model;
+        }
+      }),
+      parse: function(model) {
+        return model.namespace;
+      }
+    });
+    var c = new Collection();
+        c.reset(model, {parse:true});
+
+    equal(c.length, 2);
+    equal(c.at(0).get('name'), 'test');
+  });
+
+
+  test("Reset includes previous models in triggered event.", 1, function() {
+    var model = new Backbone.Model();
+    var collection = new Backbone.Collection([model])
+    .on('reset', function(collection, options) {
+      deepEqual(options.previousModels, [model]);
+    });
+    collection.reset([]);
+  });
+
+  test("update", function() {
+    var m1 = new Backbone.Model();
+    var m2 = new Backbone.Model({id: 2});
+    var m3 = new Backbone.Model();
+    var c = new Backbone.Collection([m1, m2]);
+
+    // Test add/change/remove events
+    c.on('add', function(model) {
+      strictEqual(model, m3);
+    });
+    c.on('change', function(model) {
+      strictEqual(model, m2);
+    });
+    c.on('remove', function(model) {
+      strictEqual(model, m1);
+    });
+
+    // remove: false doesn't remove any models
+    c.update([], {remove: false});
+    strictEqual(c.length, 2);
+
+    // add: false doesn't add any models
+    c.update([m1, m2, m3], {add: false});
+    strictEqual(c.length, 2);
+
+    // merge: false doesn't change any models
+    c.update([m1, {id: 2, a: 1}], {merge: false, remove: true});
+    strictEqual(m2.get('a'), void 0);
+
+    // add: false, remove: false only merges existing models
+    c.update([m1, {id: 2, a: 0}, m3, {id: 4}], {add: false, remove: false});
+    strictEqual(c.length, 2);
+    strictEqual(m2.get('a'), 0);
+
+    // default options add/remove/merge as appropriate
+    c.update([{id: 2, a: 1}, m3]);
+    strictEqual(c.length, 3);
+    strictEqual(m2.get('a'), 1);
+
+    // Test removing models not passing an argument
+    c.off('remove');
+    c.update([], {remove: true});
+    strictEqual(c.length, 0);
+  });
+
 });

vendor/backbone/test/events.js

@@ -17,7 +17,7 @@ $(document).ready(function() {
 
   test("binding and triggering multiple events", 4, function() {
     var obj = { counter: 0 };
-    _.extend(obj,Backbone.Events);
+    _.extend(obj, Backbone.Events);
 
     obj.on('a b c', function() { obj.counter += 1; });
 
@@ -35,6 +35,38 @@ $(document).ready(function() {
     equal(obj.counter, 5);
   });
 
+  test("binding and triggering with event maps", function() {
+    var obj = { counter: 0 };
+    _.extend(obj, Backbone.Events);
+
+    var increment = function() {
+      this.counter += 1;
+    };
+
+    obj.on({
+      a: increment,
+      b: increment,
+      c: increment
+    }, obj);
+
+    obj.trigger('a');
+    equal(obj.counter, 1);
+
+    obj.trigger('a b');
+    equal(obj.counter, 3);
+
+    obj.trigger('c');
+    equal(obj.counter, 4);
+
+    obj.off({
+      a: increment,
+      c: increment
+    }, obj);
+    obj.trigger('a b c');
+    equal(obj.counter, 5);
+  });
+
+
   test("trigger all for each event", 3, function() {
     var a, b, obj = { counter: 0 };
     _.extend(obj, Backbone.Events);
@@ -192,4 +224,90 @@ $(document).ready(function() {
     obj.trigger('event');
   });
 
+  test("once", 2, function() {
+    // Same as the previous test, but we use once rather than having to explicitly unbind
+    var obj = { counterA: 0, counterB: 0 };
+    _.extend(obj,Backbone.Events);
+    var incrA = function(){ obj.counterA += 1; obj.trigger('event'); };
+    var incrB = function(){ obj.counterB += 1 };
+    obj.once('event', incrA);
+    obj.once('event', incrB);
+    obj.trigger('event');
+    obj.trigger('event');
+    obj.trigger('event');
+    equal(obj.counterA, 1, 'counterA should have only been incremented once.');
+    equal(obj.counterB, 1, 'counterB should have only been incremented once.');
+  });
+
+  test("once variant one", 3, function() {
+    var f = function(){ ok(true); };
+
+    var a = _.extend({}, Backbone.Events).once('event', f);
+    var b = _.extend({}, Backbone.Events).on('event', f);
+
+    a.trigger('event');
+
+    b.trigger('event');
+    b.trigger('event');
+  });
+
+  test("once variant two", 3, function() {
+    var f = function(){ ok(true); };
+    var obj = _.extend({}, Backbone.Events);
+
+    obj
+      .once('event', f)
+      .on('event', f)
+      .trigger('event')
+      .trigger('event');
+  });
+
+  test("once with off", 0, function() {
+    var f = function(){ ok(true); };
+    var obj = _.extend({}, Backbone.Events);
+
+    obj.once('event', f);
+    obj.off('event', f);
+    obj.trigger('event');
+  });
+
+  test("once with event maps", function() {
+    var obj = { counter: 0 };
+    _.extend(obj, Backbone.Events);
+
+    var increment = function() {
+      this.counter += 1;
+    };
+
+    obj.once({
+      a: increment,
+      b: increment,
+      c: increment
+    }, obj);
+
+    obj.trigger('a');
+    equal(obj.counter, 1);
+
+    obj.trigger('a b');
+    equal(obj.counter, 2);
+
+    obj.trigger('c');
+    equal(obj.counter, 3);
+
+    obj.trigger('a b c');
+    equal(obj.counter, 3);
+  });
+
+  test("Backbone object inherits Events", function() {
+    ok(Backbone.on === Backbone.Events.on);
+  });
+
+  asyncTest("once with asynchronous events", 1, function() {
+    var func = _.debounce(function() { ok(true); start(); }, 50);
+    var obj = _.extend({}, Backbone.Events).once('async', func);
+
+    obj.trigger('async');
+    obj.trigger('async');
+  });
+
 });

vendor/backbone/test/model.js

@@ -270,7 +270,7 @@ $(document).ready(function() {
         };
       }
     });
-    var model = new Defaulted({two: null});
+    model = new Defaulted({two: null});
     equal(model.get('one'), 3);
     equal(model.get('two'), null);
   });
@@ -351,7 +351,7 @@ $(document).ready(function() {
     equal(lastError, "Can't change admin status.");
   });
 
-  test("isValid", 5, function() {
+  test("isValid", function() {
     var model = new Backbone.Model({valid: true});
     model.validate = function(attrs) {
       if (!attrs.valid) return "invalid";
@@ -359,8 +359,7 @@ $(document).ready(function() {
     equal(model.isValid(), true);
     equal(model.set({valid: false}), false);
     equal(model.isValid(), true);
-    ok(model.set('valid', false, {silent: true}));
-    equal(model.isValid(), false);
+    ok(!model.set('valid', false, {silent: true}));
   });
 
   test("save", 2, function() {
@@ -369,6 +368,19 @@ $(document).ready(function() {
     ok(_.isEqual(this.syncArgs.model, doc));
   });
 
+  test("save with PATCH", function() {
+    doc.clear().set({id: 1, a: 1, b: 2, c: 3, d: 4});
+    doc.save();
+    equal(this.syncArgs.method, 'update');
+    equal(this.syncArgs.options.attrs, undefined);
+
+    doc.save({b: 2, d: 4}, {patch: true});
+    equal(this.syncArgs.method, 'patch');
+    equal(_.size(this.syncArgs.options.attrs), 2);
+    equal(this.syncArgs.options.attrs.d, 4);
+    equal(this.syncArgs.options.attrs.a, undefined);
+  });
+
   test("save in positional style", 1, function() {
     var model = new Backbone.Model();
     model.sync = function(method, model, options) {
@@ -402,7 +414,7 @@ $(document).ready(function() {
     ok(true, "non-persisted model should not call sync");
   });
 
-  test("validate", 7, function() {
+  test("validate", function() {
     var lastError;
     var model = new Backbone.Model();
     model.validate = function(attrs) {
@@ -415,8 +427,6 @@ $(document).ready(function() {
     equal(result, model);
     equal(model.get('a'), 100);
     equal(lastError, undefined);
-    result = model.set({admin: true}, {silent: true});
-    equal(model.get('admin'), true);
     result = model.set({a: 200, admin: false});
     equal(lastError, "Can't change admin status.");
     equal(result, false);
@@ -639,7 +649,7 @@ $(document).ready(function() {
     equal(model.get('x'), 3);
   });
 
-  test("save with wait validates attributes", 1, function() {
+  test("save with wait validates attributes", function() {
     var model = new Backbone.Model();
     model.url = '/test';
     model.validate = function() { ok(true); };

vendor/backbone/test/router.js

@@ -107,7 +107,7 @@ $(document).ready(function() {
     },
 
     optionalItem: function(arg){
-      this.arg = arg !== undefined ? arg : null;
+      this.arg = arg !== void 0 ? arg : null;
     },
 
     splat : function(args) {
@@ -139,7 +139,7 @@ $(document).ready(function() {
     location.replace('http://example.com#search/news');
     Backbone.history.checkUrl();
     equal(router.query, 'news');
-    equal(router.page, undefined);
+    equal(router.page, void 0);
     equal(lastRoute, 'search');
     equal(lastArgs[0], 'news');
   });
@@ -265,12 +265,12 @@ $(document).ready(function() {
     if (!Backbone.history.iframe) ok(true);
   });
 
-  test("route callback gets passed decoded values", 3, function() {
+  test("#967 - Route callback gets passed encoded values.", 3, function() {
     var route = 'has%2Fslash/complex-has%23hash/has%20space';
     Backbone.history.navigate(route, {trigger: true});
-    equal(router.first, 'has/slash');
-    equal(router.part, 'has#hash');
-    equal(router.rest, 'has space');
+    strictEqual(router.first, 'has%2Fslash');
+    strictEqual(router.part, 'has%23hash');
+    strictEqual(router.rest, 'has%20space');
   });
 
   test("correctly handles URLs with % (#868)", 3, function() {
@@ -279,7 +279,7 @@ $(document).ready(function() {
     location.replace('http://example.com#search/fat');
     Backbone.history.checkUrl();
     equal(router.query, 'fat');
-    equal(router.page, undefined);
+    equal(router.page, void 0);
     equal(lastRoute, 'search');
   });