Skip to content

Commit

Permalink
Merge pull request jashkenas#2137 from tgriesser/0.9.10
Browse files Browse the repository at this point in the history
Bumping to 0.9.10
  • Loading branch information
jashkenas committed Jan 15, 2013
2 parents 7e91af0 + f12518e commit fe3f5af
Show file tree
Hide file tree
Showing 6 changed files with 356 additions and 368 deletions.
74 changes: 37 additions & 37 deletions backbone-min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions backbone.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Backbone.js 0.9.9
// Backbone.js 0.9.10

// (c) 2010-2012 Jeremy Ashkenas, DocumentCloud Inc.
// Backbone may be freely distributed under the MIT license.
Expand Down Expand Up @@ -34,7 +34,7 @@
}

// Current version of the library. Keep in sync with `package.json`.
Backbone.VERSION = '0.9.9';
Backbone.VERSION = '0.9.10';

// Require Underscore, if we're on the server, and it's not already present.
var _ = root._;
Expand Down
4 changes: 2 additions & 2 deletions docs/backbone-localstorage.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@
<span class="p">}</span>

<span class="k">if</span> <span class="p">(</span><span class="nx">resp</span><span class="p">)</span> <span class="p">{</span>
<span class="nx">options</span><span class="p">.</span><span class="nx">success</span><span class="p">(</span><span class="nx">resp</span><span class="p">);</span>
<span class="nx">options</span><span class="p">.</span><span class="nx">success</span><span class="p">(</span><span class="nx">model</span><span class="p">,</span> <span class="nx">resp</span><span class="p">,</span> <span class="nx">options</span><span class="p">);</span>
<span class="p">}</span> <span class="k">else</span> <span class="p">{</span>
<span class="nx">options</span><span class="p">.</span><span class="nx">error</span><span class="p">(</span><span class="s2">&quot;Record not found&quot;</span><span class="p">);</span>
<span class="nx">options</span><span class="p">.</span><span class="nx">error</span><span class="p">(</span><span class="nx">model</span><span class="p">,</span> <span class="s2">&quot;Record not found&quot;</span><span class="p">,</span> <span class="nx">options</span><span class="p">);</span>
<span class="p">}</span>
<span class="p">};</span>

Expand Down
Loading

0 comments on commit fe3f5af

Please sign in to comment.