s/updated/update

updating sizes and dates
mo docs
jashkenas · jashkenas · jashkenas · jashkenas · jridgewell · megawac
diff --git a/backbone-min.js b/backbone-min.js
diff --git a/backbone-min.map b/backbone-min.map
diff --git a/backbone.js b/backbone.js
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name"          : "backbone",
-  "version"       : "1.2.0",
+  "version"       : "1.2.1",
   "main"          : "backbone.js",
   "dependencies"  : {
     "underscore"  : ">=1.7.0"
diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name"          : "backbone",
-  "version"       : "1.2.0",
+  "version"       : "1.2.1",
   "description"   : "Give your JS App some Backbone with Models, Views, Collections, and Events.",
   "keywords"      : ["model", "view", "controller", "router", "server", "client", "browser"],
   "repo"          : "jashkenas/backbone",
diff --git a/docs/backbone.html b/docs/backbone.html
diff --git a/index.html b/index.html
@@ -300,7 +300,7 @@
   <div id="sidebar" class="interface">
 
     <a class="toc_title" href="#">
-      Backbone.js <span class="version">(1.2.0)</span>
+      Backbone.js <span class="version">(1.2.1)</span>
     </a>
     <ul class="toc_section">
       <li>&raquo; <a href="http://github.com/jashkenas/backbone">GitHub Repository</a></li>
@@ -356,7 +356,7 @@
       <li>– <a href="#Model-fetch">fetch</a></li>
       <li>– <a href="#Model-save">save</a></li>
       <li>– <a href="#Model-destroy">destroy</a></li>
-      <li>– <a href="#Model-Underscore-Methods"><b>Underscore Methods (8)</b></a></li>
+      <li>– <a href="#Model-Underscore-Methods"><b>Underscore Methods (9)</b></a></li>
       <li>– <a href="#Model-validate">validate</a></li>
       <li>– <a href="#Model-validationError">validationError</a></li>
       <li>– <a href="#Model-isValid">isValid</a></li>
@@ -377,6 +377,7 @@
     <ul class="toc_section">
       <li>– <a href="#Collection-extend">extend</a></li>
       <li>– <a href="#Collection-model">model</a></li>
+      <li>– <a href="#Collection-modelId">modelId</a></li>
       <li>– <a href="#Collection-constructor">constructor / initialize</a></li>
       <li>– <a href="#Collection-models">models</a></li>
       <li>– <a href="#Collection-toJSON">toJSON</a></li>
@@ -577,13 +578,13 @@ <h2 id="downloads">
 
     <table>
       <tr>
-        <td><a class="punch" href="backbone.js">Development Version (1.2.0)</a></td>
-        <td class="text"><i>60kb, Full source, tons of comments</i></td>
+        <td><a class="punch" href="backbone.js">Development Version (1.2.1)</a></td>
+        <td class="text"><i>69kb, Full source, tons of comments</i></td>
       </tr>
       <tr>
-        <td><a class="punch" href="backbone-min.js">Production Version (1.2.0)</a></td>
+        <td><a class="punch" href="backbone-min.js">Production Version (1.2.1)</a></td>
         <td class="text" style="line-height: 16px;">
-          <i>6.5kb, Packed and gzipped</i><br />
+          <i>7.3kb, Packed and gzipped</i><br />
           <small>(<a href="backbone-min.map">Source Map</a>)</small>
         </td>
       </tr>
@@ -600,7 +601,7 @@ <h2 id="downloads">
 
     <p>
       Backbone's only hard dependency is
-      <a href="http://underscorejs.org/">Underscore.js</a> <small>( >= 1.5.0)</small>.
+      <a href="http://underscorejs.org/">Underscore.js</a> <small>( >= 1.7.0)</small>.
       For RESTful persistence and DOM manipulation with <a href="#View">Backbone.View</a>,
       include <b><a href="http://jquery.com">jQuery</a></b> ( >= 1.11.0), and
       <b><a href="https://github.com/douglascrockford/JSON-js">json2.js</a></b> for older
@@ -997,22 +998,22 @@ <h2 id="Events">Backbone.Events</h2>
     </p>
 
     <ul class="small">
-      <li><b>"add"</b> (model, collection, options) &mdash; when a model is added to a collection. </li>
-      <li><b>"remove"</b> (model, collection, options) &mdash; when a model is removed from a collection. </li>
-      <li><b>"update"</b> (collection, options) &mdash; single event triggered after any number of movels have been added or removed from a collection. </li>
-      <li><b>"reset"</b> (collection, options) &mdash; when the collection's entire contents have been replaced. </li>
-      <li><b>"sort"</b> (collection, options) &mdash; when the collection has been re-sorted. </li>
-      <li><b>"change"</b> (model, options) &mdash; when a model's attributes have changed. </li>
-      <li><b>"change:[attribute]"</b> (model, value, options) &mdash; when a specific attribute has been updated. </li>
-      <li><b>"destroy"</b> (model, collection, options) &mdash; when a model is <a href="#Model-destroy">destroyed</a>. </li>
-      <li><b>"request"</b> (model_or_collection, xhr, options) &mdash; when a model or collection has started a request to the server. </li>
+      <li><b>"add"</b> (model, collection, options) &mdash; when a model is added to a collection.</li>
+      <li><b>"remove"</b> (model, collection, options) &mdash; when a model is removed from a collection.</li>
+      <li><b>"update"</b> (collection, options) &mdash; single event triggered after any number of models have been added or removed from a collection.</li>
+      <li><b>"reset"</b> (collection, options) &mdash; when the collection's entire contents have been replaced.</li>
+      <li><b>"sort"</b> (collection, options) &mdash; when the collection has been re-sorted.</li>
+      <li><b>"change"</b> (model, options) &mdash; when a model's attributes have changed.</li>
+      <li><b>"change:[attribute]"</b> (model, value, options) &mdash; when a specific attribute has been updated.</li>
+      <li><b>"destroy"</b> (model, collection, options) &mdash; when a model is <a href="#Model-destroy">destroyed</a>.</li>
+      <li><b>"request"</b> (model_or_collection, xhr, options) &mdash; when a model or collection has started a request to the server.</li>
       <li><b>"sync"</b> (model_or_collection, resp, options) &mdash; when a model or collection has been successfully synced with the server.</li>
-      <li><b>"error"</b> (model_or_collection, resp, options) &mdash; when a model's or collection's request to the server has failed. </li>
-      <li><b>"invalid"</b> (model, error, options) &mdash; when a model's <a href="#Model-validate">validation</a> fails on the client. </li>
+      <li><b>"error"</b> (model_or_collection, resp, options) &mdash; when a model's or collection's request to the server has failed.</li>
+      <li><b>"invalid"</b> (model, error, options) &mdash; when a model's <a href="#Model-validate">validation</a> fails on the client.</li>
       <li><b>"route:[name]"</b> (params) &mdash; Fired by the router when a specific route is matched.</li>
       <li><b>"route"</b> (route, params) &mdash; Fired by the router when <i>any</i> route has been matched.</li>
       <li><b>"route"</b> (router, route, params) &mdash; Fired by history when <i>any</i> route has been matched.</li>
-      <li><b>"all"</b> &mdash; this special event fires for <i>any</i> triggered event, passing the event name as the first argument. </li>
+      <li><b>"all"</b> &mdash; this special event fires for <i>any</i> triggered event, passing the event name as the first argument.</li>
     </ul>
 
     <p>
@@ -1470,9 +1471,9 @@ <h2 id="Model">Backbone.Model</h2>
 </pre>
 
     <p id="Model-Underscore-Methods">
-      <b class="header">Underscore Methods (8)</b>
+      <b class="header">Underscore Methods (9)</b>
       <br />
-      Backbone proxies to <b>Underscore.js</b> to provide 8 object functions
+      Backbone proxies to <b>Underscore.js</b> to provide 9 object functions
       on <b>Backbone.Model</b>. They aren't all documented here, but
       you can take a look at the Underscore documentation for the full details&hellip;
     </p>
@@ -1484,6 +1485,7 @@ <h2 id="Model">Backbone.Model</h2>
       <li><a href="http://underscorejs.org/#invert">invert</a></li>
       <li><a href="http://underscorejs.org/#pick">pick</a></li>
       <li><a href="http://underscorejs.org/#omit">omit</a></li>
+      <li><a href="http://underscorejs.org/#matches">matches</a></li>
       <li><a href="http://underscorejs.org/#chain">chain</a></li>
       <li><a href="http://underscorejs.org/#isEmpty">isEmpty</a></li>
     </ul>
@@ -1771,6 +1773,36 @@ <h2 id="Collection">Backbone.Collection</h2>
 });
 </pre>
 
+    <p id="Collection-modelId">
+      <b class="header">modelId</b><code>collection.modelId</code>
+      <br />
+      Override this method to specify the attribute the collection will use to
+      refer to its models in <a href="#Collection-get">collection.get</a>.
+      <br />
+      By default returns the <tt>idAttribute</tt> of the collection's model
+      class or failing that, <tt>'id'</tt>. If your collection uses polymorphic
+      models and those models have an <tt>idAttribute</tt> other than <tt>id</tt>
+      you must override this method with your own custom logic.
+    </p>
+
+<pre>
+var Library = Backbone.Collection.extend({
+
+  model: function(attrs, options) {
+    if (condition) {
+      return new PublicDocument(attrs, options);
+    } else {
+      return new PrivateDocument(attrs, options);
+    }
+  },
+
+  modelId: function(attrs) {
+    return attrs.private ? 'private_id' : 'public_id';
+  }
+
+});
+</pre>
+
     <p id="Collection-constructor">
       <b class="header">constructor / initialize</b><code>new Backbone.Collection([models], [options])</code>
       <br />
@@ -1893,7 +1925,7 @@ <h2 id="Collection">Backbone.Collection</h2>
       <b class="header">add</b><code>collection.add(models, [options])</code>
       <br />
       Add a model (or an array of models) to the collection, firing an <tt>"add"</tt>
-      event. If a <a href="#Collection-model">model</a> property is defined, you may also pass
+      event for each model, and an <tt>"update"</tt> event afterwards. If a <a href="#Collection-model">model</a> property is defined, you may also pass
       raw attributes objects, and have them be vivified as instances of the model.
       Returns the added (or preexisting, if duplicate) models.
       Pass <tt>{at: index}</tt> to splice the model into the collection at the
@@ -1928,7 +1960,8 @@ <h2 id="Collection">Backbone.Collection</h2>
       them. Each model can be a Model instance, an <tt>id</tt> string or a JS
       object, any value acceptable as the <tt>id</tt> argument of
       <a href="#Collection-get"><tt>collection.get</tt></a>.
-      Fires a <tt>"remove"</tt> event, which you can use <tt>silent</tt> to suppress.
+      Fires a <tt>"remove"</tt> event for each model, and a single
+      <tt>"update"</tt> event afterwards.
       The model's index before removal is available to listeners as
       <tt>options.index</tt>.
     </p>
@@ -4204,7 +4237,34 @@ <h2 id="examples-tzigla">Tzigla</h2>
 
     <h2 id="changelog">Change Log</h2>
 
-    <b class="header">1.2.0</b> &mdash; <small><i>Aug. 29, 2014</i></small>
+    <b class="header">1.2.1</b> &mdash; <small><i>Jun. 4, 2015</i></small>
+    &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.2.0...1.2.1">Diff</a>
+    &mdash; <a href="https://cdn.rawgit.com/jashkenas/backbone/1.2.1/index.html">Docs</a>
+    <br />
+    <ul style="margin-top: 5px;">
+      <li>
+        <tt>Collection#add</tt> now avoids trying to parse a model instance when passing <tt>parse: true</tt>.
+      </li>
+      <li>
+        Bug fix in <tt>Collection#remove</tt>.
+      </li>
+      <li>
+        <tt>Model#fetch</tt> no longer parses the response when passing <tt>patch: false</tt>.
+      </li>
+      <li>
+        Bug fix for iframe-based History when used with JSDOM.
+      </li>
+      <li>
+        Bug fix where <tt>Collection#invoke</tt> was not taking additional arguments.
+      </li>
+      <li>
+        When using <tt>on</tt> with an event map, you can now pass the context as the
+        second argument.  This was previously an undocumented behavior from 1.1.2 removed
+        in 1.2.0.
+      </li>
+    </ul>
+  
+    <b class="header">1.2.0</b> &mdash; <small><i>May 13, 2015</i></small>
     &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.1.2...1.2.0">Diff</a>
     &mdash; <a href="https://cdn.rawgit.com/jashkenas/backbone/1.2.0/index.html">Docs</a>
     <br />
@@ -4224,8 +4284,13 @@ <h2 id="changelog">Change Log</h2>
         Backbone will automatically try to load jQuery for you.
       </li>
       <li>
-        Added an <tt>"updated"</tt> event that triggers after any amount of 
-        models are added or removed from a collection. Handy to re-render lists 
+        Views now always delegate their events in <a href="#View-setElement">setElement</a>.
+        You can no longer modify the events hash or your view's <tt>el</tt> property in
+        <tt>initialize</tt>. 
+      </li>
+      <li>
+        Added an <tt>"update"</tt> event that triggers after any amount of
+        models are added or removed from a collection. Handy to re-render lists
         of things without debouncing.
       </li>
       <li>
diff --git a/package.json b/package.json
@@ -15,15 +15,14 @@
     "karma-qunit": "^0.1.4",
     "uglify-js": "^2.4.17"
   },
-  "main": "backbone.js",
   "scripts": {
     "test": "./node_modules/karma/bin/karma start && coffee test/model.coffee",
     "build": "uglifyjs backbone.js --mangle --source-map backbone-min.map -o backbone-min.js",
     "doc": "docco backbone.js && docco examples/todos/todos.js examples/backbone.localStorage.js",
     "lint": "jsl -nofilelisting -nologo -conf docs/jsl.conf -process backbone.js"
   },
   "main"          : "backbone.js",
-  "version"       : "1.2.0",
+  "version"       : "1.2.1",
   "license"       : "MIT",
   "repository": {
     "type": "git",
diff --git a/test/collection.js b/test/collection.js
@@ -298,17 +298,13 @@
     deepEqual(col.pluck('id'), [1, 2, 3]);
   });
 
-  test("remove", 7, function() {
+  test("remove", 10, function() {
     var removed = null;
-    var otherRemoved = null;
     var result = null;
     col.on('remove', function(model, col, options) {
       removed = model.get('label');
       equal(options.index, 3);
     });
-    otherCol.on('remove', function(model, col, options) {
-      otherRemoved = true;
-    });
     result = col.remove(d);
     equal(removed, 'd');
     strictEqual(result, d);
@@ -317,7 +313,13 @@
     strictEqual(result, undefined);
     equal(col.length, 3);
     equal(col.first(), a);
-    equal(otherRemoved, null);
+    col.off();
+    result = col.remove([c, d]);
+    equal(result.length, 1, 'only returns removed models');
+    equal(result[0], c, 'only returns removed models');
+    result = col.remove([c, b]);
+    equal(result.length, 1, 'only returns removed models');
+    equal(result[0], b, 'only returns removed models');
   });
 
   test("add and remove return values", 13, function() {
@@ -559,6 +561,20 @@
 
   });
 
+  test("create with wait:true should not call collection.parse", 0, function() {
+    var Collection = Backbone.Collection.extend({
+      url: '/test',
+      parse: function () {
+        ok(false);
+      }
+    });
+
+    var collection = new Collection;
+
+    collection.create({}, {wait: true});
+    this.ajaxSettings.success();
+  });
+
   test("a failing create returns model with errors", function() {
     var ValidatingModel = Backbone.Model.extend({
       validate: function(attrs) {
@@ -1605,4 +1621,19 @@
     collection.set([{id: 1}, {id: 2}]);
   });
 
+  test("#3610 - invoke collects arguments", 3, function() {
+    var Model = Backbone.Model.extend({
+        method: function(a, b, c) {
+            equal(a, 1);
+            equal(b, 2);
+            equal(c, 3);
+        }
+    });
+    var Collection = Backbone.Collection.extend({
+        model: Model
+    });
+    var collection = new Collection([{id: 1}]);
+    collection.invoke('method', 1, 2, 3);
+  });
+
 })();
diff --git a/test/events.js b/test/events.js
@@ -66,6 +66,24 @@
     equal(obj.counter, 5);
   });
 
+  test("binding and trigger with event maps context", 2, function() {
+    var obj = { counter: 0 };
+    var context = {};
+    _.extend(obj, Backbone.Events);
+
+    obj.on({
+        a: function() {
+            strictEqual(this, context, 'defaults `context` to `callback` param');
+        }
+    }, context).trigger('a');
+
+    obj.off().on({
+        a: function() {
+            strictEqual(this, context, 'will not override explicit `context` param');
+        }
+    }, this, context).trigger('a');
+  });
+
   test("listenTo and stopListening", 1, function() {
     var a = _.extend({}, Backbone.Events);
     var b = _.extend({}, Backbone.Events);
diff --git a/test/model.js b/test/model.js
@@ -550,6 +550,21 @@
     model.destroy(options);
   });
 
+  test("#3470 - save and fetch with parse false", 2, function() {
+    var i = 0;
+    var model = new Backbone.Model();
+    model.parse = function() {
+      ok(false);
+    };
+    model.sync = function(method, model, options) {
+      options.success({i: ++i});
+    };
+    model.fetch({parse: false});
+    equal(model.get('i'), i);
+    model.save(null, {parse: false});
+    equal(model.get('i'), i);
+  });
+
   test("save with PATCH", function() {
     doc.clear().set({id: 1, a: 1, b: 2, c: 3, d: 4});
     doc.save();
diff --git a/test/router.js b/test/router.js
@@ -918,7 +918,7 @@
 
   test('#3358 - pushState to hashChange transition with search params', 1, function() {
     Backbone.history.stop();
-    location.replace('/root?foo=bar');
+    location.replace('http://example.com/root?foo=bar');
     location.replace = function(url) {
       strictEqual(url, '/root#?foo=bar');
     };