Skip to content

Commit 65f6706

Browse files
committed
draft changelog for backbone 1.2.0
1 parent c349965 commit 65f6706

File tree

10 files changed

+1147
-757
lines changed

10 files changed

+1147
-757
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.2
1+
// Backbone.js 1.2.0
22

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

4141
// Current version of the library. Keep in sync with `package.json`.
42-
Backbone.VERSION = '1.1.2';
42+
Backbone.VERSION = '1.2.0';
4343

4444
// For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
4545
// 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.2",
3+
"version" : "1.2.0",
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.2",
3+
"version" : "1.2.0",
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: 1020 additions & 693 deletions
Large diffs are not rendered by default.

docs/backbone.localstorage.html

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h1>backbone.localstorage.js</h1>
5757
*
5858
* https://github.com/jeromegn/Backbone.localStorage
5959
*/</span>
60-
(<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-params">(root, factory)</span> {</span>
60+
(<span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-params">(root, factory)</span> </span>{
6161
<span class="hljs-keyword">if</span> (<span class="hljs-keyword">typeof</span> define === <span class="hljs-string">"function"</span> &amp;&amp; define.amd) {</pre></div></div>
6262

6363
</li>
@@ -73,7 +73,7 @@ <h1>backbone.localstorage.js</h1>
7373

7474
</div>
7575

76-
<div class="content"><div class='highlight'><pre> define([<span class="hljs-string">"underscore"</span>,<span class="hljs-string">"backbone"</span>], <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(_, Backbone)</span> {</span></pre></div></div>
76+
<div class="content"><div class='highlight'><pre> define([<span class="hljs-string">"underscore"</span>,<span class="hljs-string">"backbone"</span>], <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(_, Backbone)</span> </span>{</pre></div></div>
7777

7878
</li>
7979

@@ -107,7 +107,7 @@ <h1>backbone.localstorage.js</h1>
107107

108108
<div class="content"><div class='highlight'><pre> factory(_, Backbone);
109109
}
110-
}(<span class="hljs-keyword">this</span>, <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(_, Backbone)</span> {</span></pre></div></div>
110+
}(<span class="hljs-keyword">this</span>, <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(_, Backbone)</span> </span>{</pre></div></div>
111111

112112
</li>
113113

@@ -151,7 +151,7 @@ <h1>backbone.localstorage.js</h1>
151151

152152
</div>
153153

154-
<div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">S4</span><span class="hljs-params">()</span> {</span>
154+
<div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">S4</span><span class="hljs-params">()</span> </span>{
155155
<span class="hljs-keyword">return</span> (((<span class="hljs-number">1</span>+<span class="hljs-built_in">Math</span>.random())*<span class="hljs-number">0x10000</span>)|<span class="hljs-number">0</span>).toString(<span class="hljs-number">16</span>).substring(<span class="hljs-number">1</span>);
156156
};</pre></div></div>
157157

@@ -168,7 +168,7 @@ <h1>backbone.localstorage.js</h1>
168168

169169
</div>
170170

171-
<div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">guid</span><span class="hljs-params">()</span> {</span>
171+
<div class="content"><div class='highlight'><pre><span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-title">guid</span><span class="hljs-params">()</span> </span>{
172172
<span class="hljs-keyword">return</span> (S4()+S4()+<span class="hljs-string">"-"</span>+S4()+<span class="hljs-string">"-"</span>+S4()+<span class="hljs-string">"-"</span>+S4()+<span class="hljs-string">"-"</span>+S4()+S4()+S4());
173173
};</pre></div></div>
174174

@@ -187,7 +187,7 @@ <h1>backbone.localstorage.js</h1>
187187

188188
</div>
189189

190-
<div class="content"><div class='highlight'><pre>Backbone.LocalStorage = window.Store = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(name)</span> {</span>
190+
<div class="content"><div class='highlight'><pre>Backbone.LocalStorage = <span class="hljs-built_in">window</span>.Store = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(name)</span> </span>{
191191
<span class="hljs-keyword">this</span>.name = name;
192192
<span class="hljs-keyword">var</span> store = <span class="hljs-keyword">this</span>.localStorage().getItem(<span class="hljs-keyword">this</span>.name);
193193
<span class="hljs-keyword">this</span>.records = (store &amp;&amp; store.split(<span class="hljs-string">","</span>)) || [];
@@ -208,7 +208,7 @@ <h1>backbone.localstorage.js</h1>
208208

209209
</div>
210210

211-
<div class="content"><div class='highlight'><pre> save: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">()</span> {</span>
211+
<div class="content"><div class='highlight'><pre> save: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">()</span> </span>{
212212
<span class="hljs-keyword">this</span>.localStorage().setItem(<span class="hljs-keyword">this</span>.name, <span class="hljs-keyword">this</span>.records.join(<span class="hljs-string">","</span>));
213213
},</pre></div></div>
214214

@@ -226,7 +226,7 @@ <h1>backbone.localstorage.js</h1>
226226

227227
</div>
228228

229-
<div class="content"><div class='highlight'><pre> create: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> {</span>
229+
<div class="content"><div class='highlight'><pre> create: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> </span>{
230230
<span class="hljs-keyword">if</span> (!model.id) {
231231
model.id = guid();
232232
model.set(model.idAttribute, model.id);
@@ -250,7 +250,7 @@ <h1>backbone.localstorage.js</h1>
250250

251251
</div>
252252

253-
<div class="content"><div class='highlight'><pre> update: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> {</span>
253+
<div class="content"><div class='highlight'><pre> update: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> </span>{
254254
<span class="hljs-keyword">this</span>.localStorage().setItem(<span class="hljs-keyword">this</span>.name+<span class="hljs-string">"-"</span>+model.id, <span class="hljs-built_in">JSON</span>.stringify(model));
255255
<span class="hljs-keyword">if</span> (!_.include(<span class="hljs-keyword">this</span>.records, model.id.toString()))
256256
<span class="hljs-keyword">this</span>.records.push(model.id.toString()); <span class="hljs-keyword">this</span>.save();
@@ -270,7 +270,7 @@ <h1>backbone.localstorage.js</h1>
270270

271271
</div>
272272

273-
<div class="content"><div class='highlight'><pre> find: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> {</span>
273+
<div class="content"><div class='highlight'><pre> find: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> </span>{
274274
<span class="hljs-keyword">return</span> <span class="hljs-keyword">this</span>.jsonData(<span class="hljs-keyword">this</span>.localStorage().getItem(<span class="hljs-keyword">this</span>.name+<span class="hljs-string">"-"</span>+model.id));
275275
},</pre></div></div>
276276

@@ -287,9 +287,9 @@ <h1>backbone.localstorage.js</h1>
287287

288288
</div>
289289

290-
<div class="content"><div class='highlight'><pre> findAll: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">()</span> {</span>
290+
<div class="content"><div class='highlight'><pre> findAll: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">()</span> </span>{
291291
<span class="hljs-keyword">return</span> _(<span class="hljs-keyword">this</span>.records).chain()
292-
.map(<span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(id)</span>{</span>
292+
.map(<span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(id)</span></span>{
293293
<span class="hljs-keyword">return</span> <span class="hljs-keyword">this</span>.jsonData(<span class="hljs-keyword">this</span>.localStorage().getItem(<span class="hljs-keyword">this</span>.name+<span class="hljs-string">"-"</span>+id));
294294
}, <span class="hljs-keyword">this</span>)
295295
.compact()
@@ -309,18 +309,18 @@ <h1>backbone.localstorage.js</h1>
309309

310310
</div>
311311

312-
<div class="content"><div class='highlight'><pre> destroy: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> {</span>
312+
<div class="content"><div class='highlight'><pre> destroy: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> </span>{
313313
<span class="hljs-keyword">if</span> (model.isNew())
314314
<span class="hljs-keyword">return</span> <span class="hljs-literal">false</span>
315315
<span class="hljs-keyword">this</span>.localStorage().removeItem(<span class="hljs-keyword">this</span>.name+<span class="hljs-string">"-"</span>+model.id);
316-
<span class="hljs-keyword">this</span>.records = _.reject(<span class="hljs-keyword">this</span>.records, <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(id)</span>{</span>
316+
<span class="hljs-keyword">this</span>.records = _.reject(<span class="hljs-keyword">this</span>.records, <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(id)</span></span>{
317317
<span class="hljs-keyword">return</span> id === model.id.toString();
318318
});
319319
<span class="hljs-keyword">this</span>.save();
320320
<span class="hljs-keyword">return</span> model;
321321
},
322322

323-
localStorage: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">()</span> {</span>
323+
localStorage: <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">()</span> </span>{
324324
<span class="hljs-keyword">return</span> localStorage;
325325
},</pre></div></div>
326326

@@ -337,7 +337,7 @@ <h1>backbone.localstorage.js</h1>
337337

338338
</div>
339339

340-
<div class="content"><div class='highlight'><pre> jsonData: <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-params">(data)</span> {</span>
340+
<div class="content"><div class='highlight'><pre> jsonData: <span class="hljs-function"><span class="hljs-keyword">function</span> <span class="hljs-params">(data)</span> </span>{
341341
<span class="hljs-keyword">return</span> data &amp;&amp; <span class="hljs-built_in">JSON</span>.parse(data);
342342
}
343343

@@ -358,7 +358,7 @@ <h1>backbone.localstorage.js</h1>
358358

359359
</div>
360360

361-
<div class="content"><div class='highlight'><pre>Backbone.LocalStorage.sync = window.Store.sync = Backbone.localSync = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(method, model, options)</span> {</span>
361+
<div class="content"><div class='highlight'><pre>Backbone.LocalStorage.sync = <span class="hljs-built_in">window</span>.Store.sync = Backbone.localSync = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(method, model, options)</span> </span>{
362362
<span class="hljs-keyword">var</span> store = model.localStorage || model.collection.localStorage;
363363

364364
<span class="hljs-keyword">var</span> resp, errorMessage, syncDfd = $.Deferred &amp;&amp; $.Deferred(); <span class="hljs-comment">//If $ is having Deferred - use it.</span>
@@ -381,7 +381,7 @@ <h1>backbone.localstorage.js</h1>
381381
}
382382

383383
} <span class="hljs-keyword">catch</span>(error) {
384-
<span class="hljs-keyword">if</span> (error.code === DOMException.QUOTA_EXCEEDED_ERR &amp;&amp; window.localStorage.length === <span class="hljs-number">0</span>)
384+
<span class="hljs-keyword">if</span> (error.code === DOMException.QUOTA_EXCEEDED_ERR &amp;&amp; <span class="hljs-built_in">window</span>.localStorage.length === <span class="hljs-number">0</span>)
385385
errorMessage = <span class="hljs-string">"Private browsing is unsupported"</span>;
386386
<span class="hljs-keyword">else</span>
387387
errorMessage = error.message;
@@ -425,7 +425,7 @@ <h1>backbone.localstorage.js</h1>
425425

426426
Backbone.ajaxSync = Backbone.sync;
427427

428-
Backbone.getSyncMethod = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> {</span>
428+
Backbone.getSyncMethod = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(model)</span> </span>{
429429
<span class="hljs-keyword">if</span>(model.localStorage || (model.collection &amp;&amp; model.collection.localStorage)) {
430430
<span class="hljs-keyword">return</span> Backbone.localSync;
431431
}
@@ -447,7 +447,7 @@ <h1>backbone.localstorage.js</h1>
447447

448448
</div>
449449

450-
<div class="content"><div class='highlight'><pre>Backbone.sync = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(method, model, options)</span> {</span>
450+
<div class="content"><div class='highlight'><pre>Backbone.sync = <span class="hljs-function"><span class="hljs-keyword">function</span><span class="hljs-params">(method, model, options)</span> </span>{
451451
<span class="hljs-keyword">return</span> Backbone.getSyncMethod(model).apply(<span class="hljs-keyword">this</span>, [method, model, options]);
452452
};
453453

0 commit comments

Comments
 (0)