Backbone.js 1.2.3

jashkenas · Sep 3, 2015 · 05fde9e · 05fde9e
1 parent b75329c
commit 05fde9e
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
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
@@ -1,4 +1,4 @@
-//     Backbone.js 1.2.2
+//     Backbone.js 1.2.3
 
 //     (c) 2010-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
 //     Backbone may be freely distributed under the MIT license.
@@ -44,7 +44,7 @@
   var slice = Array.prototype.slice;
 
   // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '1.2.2';
+  Backbone.VERSION = '1.2.3';
 
   // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
   // the `$` variable.

diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name"          : "backbone",
-  "version"       : "1.2.2",
+  "version"       : "1.2.3",
   "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
@@ -27,7 +27,7 @@ <h1>backbone.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-1">&#182;</a>
               </div>
-              <pre><code>Backbone.js <span class="hljs-number">1.2</span><span class="hljs-number">.2</span>
+              <pre><code>Backbone.js <span class="hljs-number">1.2</span><span class="hljs-number">.3</span>
 </code></pre>
             </div>
 
@@ -206,7 +206,7 @@ <h2 id="initial-setup">Initial Setup</h2>
 
             </div>
 
-            <div class="content"><div class='highlight'><pre>  Backbone.VERSION = <span class="hljs-string">'1.2.2'</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  Backbone.VERSION = <span class="hljs-string">'1.2.3'</span>;</pre></div></div>
 
         </li>
 
@@ -2015,6 +2015,7 @@ <h2 id="backbone-collection">Backbone.Collection</h2>
             </div>
 
             <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">var</span> splice = <span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params">array, insert, at</span>) </span>{
+    at = <span class="hljs-built_in">Math</span>.min(<span class="hljs-built_in">Math</span>.max(at, <span class="hljs-number">0</span>), array.length);
     <span class="hljs-keyword">var</span> tail = <span class="hljs-built_in">Array</span>(array.length - at);
     <span class="hljs-keyword">var</span> length = insert.length;
     <span class="hljs-keyword">for</span> (<span class="hljs-keyword">var</span> i = <span class="hljs-number">0</span>; i &lt; tail.length; i++) tail[i] = array[i + at];

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.2)</span>
+      Backbone.js <span class="version">(1.2.3)</span>
     </a>
     <ul class="toc_section">
       <li>&raquo; <a href="http://github.com/jashkenas/backbone">GitHub Repository</a></li>
@@ -579,11 +579,11 @@ <h2 id="downloads">
 
     <table>
       <tr>
-        <td><a class="punch" href="backbone.js">Development Version (1.2.2)</a></td>
+        <td><a class="punch" href="backbone.js">Development Version (1.2.3)</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.2)</a></td>
+        <td><a class="punch" href="backbone-min.js">Production Version (1.2.3)</a></td>
         <td class="text" style="line-height: 16px;">
           <i>7.3kb, Packed and gzipped</i><br />
           <small>(<a href="backbone-min.map">Source Map</a>)</small>
@@ -4282,6 +4282,17 @@ <h2 id="examples-tzigla">Tzigla</h2>
 
     <h2 id="changelog">Change Log</h2>
 
+    <b class="header">1.2.3</b> &mdash; <small><i>Sept. 3, 2015</i></small>
+    &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.2.2...1.2.3">Diff</a>
+    &mdash; <a href="https://cdn.rawgit.com/jashkenas/backbone/1.2.3/index.html">Docs</a>
+    <br />
+    <ul style="margin-top: 5px;">
+      <li>
+        Fixed a minor regression in 1.2.2 that would cause an error when adding 
+        a model to a collection <tt>at</tt> an out of bounds index.
+      </li>
+    </ul>
+
     <b class="header">1.2.2</b> &mdash; <small><i>Aug. 19, 2015</i></small>
     &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.2.1...1.2.2">Diff</a>
     &mdash; <a href="https://cdn.rawgit.com/jashkenas/backbone/1.2.2/index.html">Docs</a>

diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "lint": "jsl -nofilelisting -nologo -conf docs/jsl.conf -process backbone.js"
   },
   "main"          : "backbone.js",
-  "version"       : "1.2.2",
+  "version"       : "1.2.3",
   "license"       : "MIT",
   "repository": {
     "type": "git",