Merge pull request #3998 from jashkenas/1.3.3

Create 1.3.3 Release
jashkenas · Apr 5, 2016 · 8ec8860 · 8ec8860
2 parents c8757f4 + b8c054a
commit 8ec8860
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 19 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.3.2
+//     Backbone.js 1.3.3
 
 //     (c) 2010-2016 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.3.2';
+  Backbone.VERSION = '1.3.3';
 
   // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
   // the `$` variable.

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.3</span><span class="hljs-number">.2</span>
+              <pre><code>Backbone.js <span class="hljs-number">1.3</span><span class="hljs-number">.3</span>
 </code></pre>
             </div>
 
@@ -40,7 +40,7 @@ <h1>backbone.js</h1>
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-2">&#182;</a>
               </div>
-              <pre><code>(c) <span class="hljs-number">2010</span>-<span class="hljs-number">2016</span> Jeremy Ashkenas, DocumentCloud and Investigative Reporters &amp; Editors
+              <pre><code>(c) <span class="hljs-number">2010</span><span class="hljs-number">-2016</span> Jeremy Ashkenas, DocumentCloud and Investigative Reporters &amp; Editors
 Backbone may be freely distributed under the MIT license.
 For all details and documentation:
 http:<span class="hljs-comment">//backbonejs.org</span>
@@ -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.3.2'</span>;</pre></div></div>
+            <div class="content"><div class='highlight'><pre>  Backbone.VERSION = <span class="hljs-string">'1.3.3'</span>;</pre></div></div>
 
         </li>
 
@@ -828,6 +828,7 @@ <h2 id="backbone-events">Backbone.Events</h2>
             </div>
 
             <div class="content"><div class='highlight'><pre>    <span class="hljs-keyword">var</span> events = eventsApi(onceMap, {}, name, callback, _.bind(<span class="hljs-keyword">this</span>.off, <span class="hljs-keyword">this</span>));
+    <span class="hljs-keyword">if</span> (<span class="hljs-keyword">typeof</span> name === <span class="hljs-string">'string'</span> &amp;&amp; context == <span class="hljs-literal">null</span>) callback = <span class="hljs-keyword">void</span> <span class="hljs-number">0</span>;
     <span class="hljs-keyword">return</span> <span class="hljs-keyword">this</span>.on(events, callback, context);
   };</pre></div></div>
 
@@ -955,7 +956,7 @@ <h2 id="backbone-events">Backbone.Events</h2>
             </div>
 
             <div class="content"><div class='highlight'><pre>  <span class="hljs-keyword">var</span> triggerEvents = <span class="hljs-function"><span class="hljs-keyword">function</span>(<span class="hljs-params">events, args</span>) </span>{
-    <span class="hljs-keyword">var</span> ev, i = -<span class="hljs-number">1</span>, l = events.length, a1 = args[<span class="hljs-number">0</span>], a2 = args[<span class="hljs-number">1</span>], a3 = args[<span class="hljs-number">2</span>];
+    <span class="hljs-keyword">var</span> ev, i = <span class="hljs-number">-1</span>, l = events.length, a1 = args[<span class="hljs-number">0</span>], a2 = args[<span class="hljs-number">1</span>], a3 = args[<span class="hljs-number">2</span>];
     <span class="hljs-keyword">switch</span> (args.length) {
       <span class="hljs-keyword">case</span> <span class="hljs-number">0</span>: <span class="hljs-keyword">while</span> (++i &lt; l) (ev = events[i]).callback.call(ev.ctx); <span class="hljs-keyword">return</span>;
       <span class="hljs-keyword">case</span> <span class="hljs-number">1</span>: <span class="hljs-keyword">while</span> (++i &lt; l) (ev = events[i]).callback.call(ev.ctx, a1); <span class="hljs-keyword">return</span>;
@@ -4308,7 +4309,7 @@ <h2 id="backbone-history">Backbone.History</h2>
             </div>
 
             <div class="content"><div class='highlight'><pre>        <span class="hljs-keyword">if</span> (!<span class="hljs-keyword">this</span>._hasPushState &amp;&amp; !<span class="hljs-keyword">this</span>.atRoot()) {
-          <span class="hljs-keyword">var</span> rootPath = <span class="hljs-keyword">this</span>.root.slice(<span class="hljs-number">0</span>, -<span class="hljs-number">1</span>) || <span class="hljs-string">'/'</span>;
+          <span class="hljs-keyword">var</span> rootPath = <span class="hljs-keyword">this</span>.root.slice(<span class="hljs-number">0</span>, <span class="hljs-number">-1</span>) || <span class="hljs-string">'/'</span>;
           <span class="hljs-keyword">this</span>.location.replace(rootPath + <span class="hljs-string">'#'</span> + <span class="hljs-keyword">this</span>.getPath());</pre></div></div>
 
         </li>
@@ -4365,7 +4366,7 @@ <h2 id="backbone-history">Backbone.History</h2>
         <span class="hljs-keyword">this</span>.iframe = <span class="hljs-built_in">document</span>.createElement(<span class="hljs-string">'iframe'</span>);
         <span class="hljs-keyword">this</span>.iframe.src = <span class="hljs-string">'javascript:0'</span>;
         <span class="hljs-keyword">this</span>.iframe.style.display = <span class="hljs-string">'none'</span>;
-        <span class="hljs-keyword">this</span>.iframe.tabIndex = -<span class="hljs-number">1</span>;
+        <span class="hljs-keyword">this</span>.iframe.tabIndex = <span class="hljs-number">-1</span>;
         <span class="hljs-keyword">var</span> body = <span class="hljs-built_in">document</span>.body;</pre></div></div>
 
         </li>
@@ -4666,7 +4667,7 @@ <h2 id="backbone-history">Backbone.History</h2>
 
             <div class="content"><div class='highlight'><pre>      <span class="hljs-keyword">var</span> rootPath = <span class="hljs-keyword">this</span>.root;
       <span class="hljs-keyword">if</span> (fragment === <span class="hljs-string">''</span> || fragment.charAt(<span class="hljs-number">0</span>) === <span class="hljs-string">'?'</span>) {
-        rootPath = rootPath.slice(<span class="hljs-number">0</span>, -<span class="hljs-number">1</span>) || <span class="hljs-string">'/'</span>;
+        rootPath = rootPath.slice(<span class="hljs-number">0</span>, <span class="hljs-number">-1</span>) || <span class="hljs-string">'/'</span>;
       }
       <span class="hljs-keyword">var</span> url = rootPath + fragment;</pre></div></div>
 

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.3.2)</span>
+      Backbone.js <span class="version">(1.3.3)</span>
     </a>
     <ul class="toc_section">
       <li>&raquo; <a href="http://github.com/jashkenas/backbone">GitHub Repository</a></li>
@@ -579,13 +579,13 @@ <h2 id="downloads">
 
     <table>
       <tr>
-        <td><a class="punch" href="backbone.js">Development Version (1.3.2)</a></td>
+        <td><a class="punch" href="backbone.js">Development Version (1.3.3)</a></td>
         <td class="text"><i>72kb, Full source, tons of comments</i></td>
       </tr>
       <tr>
-        <td><a class="punch" href="backbone-min.js">Production Version (1.3.2)</a></td>
+        <td><a class="punch" href="backbone-min.js">Production Version (1.3.3)</a></td>
         <td class="text" style="line-height: 16px;">
-          <i>7.5kb, Packed and gzipped</i><br />
+          <i>7.6kb, Packed and gzipped</i><br />
           <small>(<a href="backbone-min.map">Source Map</a>)</small>
         </td>
       </tr>
@@ -4297,9 +4297,9 @@ <h2 id="examples-tzigla">Tzigla</h2>
 
     <h2 id="changelog">Change Log</h2>
 
-    <b class="header">1.3.2</b> &mdash; <small><i>Mar. 12, 2016</i></small>
-    &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.2.3...1.3.2">Diff</a>
-    &mdash; <a href="https://cdn.rawgit.com/jashkenas/backbone/1.3.2/index.html">Docs</a>
+    <b class="header">1.3.3</b> &mdash; <small><i>Mar. 12, 2016</i></small>
+    &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.2.3...1.3.3">Diff</a>
+    &mdash; <a href="https://cdn.rawgit.com/jashkenas/backbone/1.3.3/index.html">Docs</a>
     <br />
     <ul style="margin-top: 5px;">
       <li>

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "lint": "eslint backbone.js test/*.js"
   },
   "main": "backbone.js",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "license": "MIT",
   "repository": {
     "type": "git",