Skip to content

Commit 53f7790

Browse files
jashkenasjashkenas
committed
Backbone 1.1.2
1 parent 01f7f9b commit 53f7790

8 files changed

+32
-17
lines changed

‎backbone-min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backbone-min.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎backbone.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Backbone.js 1.1.1
1+
// Backbone.js 1.1.2
22

33
// (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
44
// Backbone may be freely distributed under the MIT license.
@@ -41,7 +41,7 @@
4141
var splice = array.splice;
4242

4343
// Current version of the library. Keep in sync with `package.json`.
44-
Backbone.VERSION = '1.1.1';
44+
Backbone.VERSION = '1.1.2';
4545

4646
// For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
4747
// the `$` variable.

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name" : "backbone",
3-
"version" : "1.1.1",
3+
"version" : "1.1.2",
44
"main" : "backbone.js",
55
"dependencies" : {
66
"underscore" : ">=1.5.0"

‎component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name" : "backbone",
3-
"version" : "1.1.1",
3+
"version" : "1.1.2",
44
"description" : "Give your JS App some Backbone with Models, Views, Collections, and Events.",
55
"keywords" : ["model", "view", "controller", "router", "server", "client", "browser"],
66
"repo" : "jashkenas/backbone",

‎docs/backbone.html

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ <h1>backbone.js</h1>
2727
<div class="pilwrap ">
2828
<a class="pilcrow" href="#section-1">&#182;</a>
2929
</div>
30-
<pre><code>Backbone.js <span class="hljs-number">1.1</span><span class="hljs-number">.1</span>
30+
<pre><code>Backbone.js <span class="hljs-number">1.1</span><span class="hljs-number">.2</span>
3131
</code></pre>
3232
</div>
3333

@@ -97,9 +97,8 @@ <h1>backbone.js</h1>
9797
</div>
9898

9999
<div class="content"><div class='highlight'><pre> } <span class="hljs-keyword">else</span> <span class="hljs-keyword">if</span> (<span class="hljs-keyword">typeof</span> exports !== <span class="hljs-string">'undefined'</span>) {
100-
<span class="hljs-keyword">var</span> _ = <span class="hljs-built_in">require</span>(<span class="hljs-string">'underscore'</span>), $;
101-
<span class="hljs-keyword">try</span> { $ = <span class="hljs-built_in">require</span>(<span class="hljs-string">'jquery'</span>); } <span class="hljs-keyword">catch</span>(e) {}
102-
factory(root, exports, _, $);</pre></div></div>
100+
<span class="hljs-keyword">var</span> _ = <span class="hljs-built_in">require</span>(<span class="hljs-string">'underscore'</span>);
101+
factory(root, exports, _);</pre></div></div>
103102

104103
</li>
105104

@@ -192,7 +191,7 @@ <h2 id="initial-setup">Initial Setup</h2>
192191

193192
</div>
194193

195-
<div class="content"><div class='highlight'><pre> Backbone.VERSION = <span class="hljs-string">'1.1.1'</span>;</pre></div></div>
194+
<div class="content"><div class='highlight'><pre> Backbone.VERSION = <span class="hljs-string">'1.1.2'</span>;</pre></div></div>
196195

197196
</li>
198197

@@ -3270,7 +3269,7 @@ <h2 id="backbone-router">Backbone.Router</h2>
32703269
<span class="hljs-keyword">return</span> optional ? match : <span class="hljs-string">'([^/?]+)'</span>;
32713270
})
32723271
.replace(splatParam, <span class="hljs-string">'([^?]*?)'</span>);
3273-
<span class="hljs-keyword">return</span> <span class="hljs-keyword">new</span> <span class="hljs-built_in">RegExp</span>(<span class="hljs-string">'^'</span> + route + <span class="hljs-string">'(?:\\?(.*))?$'</span>);
3272+
<span class="hljs-keyword">return</span> <span class="hljs-keyword">new</span> <span class="hljs-built_in">RegExp</span>(<span class="hljs-string">'^'</span> + route + <span class="hljs-string">'(?:\\?([\\s\\S]*))?$'</span>);
32743273
},</pre></div></div>
32753274

32763275
</li>
@@ -3751,7 +3750,7 @@ <h2 id="backbone-history">Backbone.History</h2>
37513750

37523751
<div class="content"><div class='highlight'><pre> stop: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">()</span> {</span>
37533752
Backbone.$(window).off(<span class="hljs-string">'popstate'</span>, <span class="hljs-keyword">this</span>.checkUrl).off(<span class="hljs-string">'hashchange'</span>, <span class="hljs-keyword">this</span>.checkUrl);
3754-
clearInterval(<span class="hljs-keyword">this</span>._checkUrlInterval);
3753+
<span class="hljs-keyword">if</span> (<span class="hljs-keyword">this</span>._checkUrlInterval) clearInterval(<span class="hljs-keyword">this</span>._checkUrlInterval);
37553754
History.started = <span class="hljs-literal">false</span>;
37563755
},</pre></div></div>
37573756

‎index.html

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@
285285
<div id="sidebar" class="interface">
286286

287287
<a class="toc_title" href="#">
288-
Backbone.js <span class="version">(1.1.1)</span>
288+
Backbone.js <span class="version">(1.1.2)</span>
289289
</a>
290290
<ul class="toc_section">
291291
<li>&raquo; <a href="http://github.com/jashkenas/backbone">GitHub Repository</a></li>
@@ -559,11 +559,11 @@ <h2 id="downloads">
559559

560560
<table>
561561
<tr>
562-
<td><a class="punch" href="backbone.js">Development Version (1.1.1)</a></td>
562+
<td><a class="punch" href="backbone.js">Development Version (1.1.2)</a></td>
563563
<td class="text"><i>60kb, Full source, tons of comments</i></td>
564564
</tr>
565565
<tr>
566-
<td><a class="punch" href="backbone-min.js">Production Version (1.1.1)</a></td>
566+
<td><a class="punch" href="backbone-min.js">Production Version (1.1.2)</a></td>
567567
<td class="text" style="line-height: 16px;">
568568
<i>6.5kb, Packed and gzipped</i><br />
569569
<small>(<a href="backbone-min.map">Source Map</a>)</small>
@@ -4031,6 +4031,22 @@ <h2 id="examples-tzigla">Tzigla</h2>
40314031

40324032
<h2 id="changelog">Change Log</h2>
40334033

4034+
<b class="header">1.1.2</b> &mdash; <small><i>Feb. 20, 2014</i></small>
4035+
&mdash; <a href="https://github.com/jashkenas/backbone/compare/1.1.1...1.1.2">Diff</a>
4036+
&mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/1.1.2/index.html">Docs</a>
4037+
<br />
4038+
<ul style="margin-top: 5px;">
4039+
<li>
4040+
Backbone no longer tries to require jQuery in Node/CommonJS environments,
4041+
for better compatibility with folks using Browserify.
4042+
If you'd like to have Backbone use jQuery from Node, assign it like so:
4043+
<tt>Backbone.$ = require('jquery');</tt>
4044+
</li>
4045+
<li>
4046+
Bugfix for route parameters with newlines in them.
4047+
</li>
4048+
</ul>
4049+
40344050
<b class="header">1.1.1</b> &mdash; <small><i>Feb. 13, 2014</i></small> &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.1.0...1.1.1">Diff</a> &mdash; <a href="http://htmlpreview.github.com/?https://raw.github.com/jashkenas/backbone/1.1.1/index.html">Docs</a><br />
40354051
<ul style="margin-top: 5px;">
40364052
<li>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"lint": "jsl -nofilelisting -nologo -conf docs/jsl.conf -process backbone.js"
2020
},
2121
"main" : "backbone.js",
22-
"version" : "1.1.1",
22+
"version" : "1.1.2",
2323
"license" : "MIT",
2424
"repository": {
2525
"type": "git",

0 commit comments

Comments
 (0)