Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
7554b2f
draft changelog for backbone 1.2.0
akre54 Aug 29, 2014
325a50f
Allow Collection.at to accept negative indexes
jisaacks Aug 27, 2014
63790cd
Add test for negative indexes in `at` method
jisaacks Sep 2, 2014
7e4f140
Set correct number of assertions
jisaacks Sep 2, 2014
028fc59
Update README to better match backbonejs.org
NickStefan Sep 23, 2014
d54a8a4
removed the strong tags, but kept the "with" on 14
NickStefan Sep 25, 2014
cd15abf
Update backbone.js comment for clarity
biversen21 Sep 26, 2014
5025d3c
fix flawed test
hmil Oct 2, 2014
b93030b
Use matches in .where
megawac Oct 3, 2014
b4f65f7
fix wrong test: collection.model must be a function
hmil Oct 3, 2014
342b24b
don't just test for the presence of options, test that it points to t…
akre54 Oct 3, 2014
2878091
clone options passed to reset
Oct 9, 2014
a8f8e82
Hyphenate compound modifier.
Oct 21, 2014
b7eeb0c
Un-split an infinitive verb tense.
Oct 22, 2014
a5d7b63
Un-split infinitive [v 2].
Oct 22, 2014
ded60e4
Update trailing slash for search params.
braddunbar Oct 23, 2014
5410804
Transition with search params.
braddunbar Oct 24, 2014
52416c1
fixed camel case filename for doc run script
morganrallen Oct 28, 2014
7ab8fea
Don't check hash from iframe.
braddunbar Oct 30, 2014
ae3bf02
Failing spec for listenToOnce
jamesplease Oct 14, 2014
a7016ec
Fixes listenToOnce memory leak.
jamesplease Oct 20, 2014
570a881
test for correct context in event maps
akre54 Oct 27, 2014
c942ce3
fix listenToOnce with event maps
akre54 Oct 27, 2014
a7587d7
use on in all cases of listenTo
akre54 Oct 27, 2014
d61ab4d
implement listenToOnce via listenTo
akre54 Oct 27, 2014
1000f7c
use clearer event names
akre54 Oct 28, 2014
cb8cbf8
de-duplicate some of the listenToOnce wrapCallback logic
akre54 Oct 29, 2014
00542f9
Return `this` from `#listenTo`
jridgewell Oct 29, 2014
e00dd73
Register stopListening once instead of wrapping
jridgewell Oct 29, 2014
ad0006f
Remove duplicated context
jridgewell Oct 29, 2014
b19f087
Test both `_listeningTo` and `_events` are empty
jridgewell Oct 29, 2014
07913be
Clean up references on both listener and listened objects
jridgewell Oct 29, 2014
55749e8
Invert the for loop
jridgewell Oct 29, 2014
9c8fd8c
move listenTo and listenToOnce in with the rest of the Backbone Event…
akre54 Oct 29, 2014
19a37e8
check for cleaned up references in listenToOnce with stopListening
akre54 Oct 29, 2014
2b6cf70
remove double event binding. Simply stashing the original callback wo…
akre54 Oct 30, 2014
5ae9863
Remove duplicated tests
jridgewell Oct 30, 2014
9c297ed
Test that `listenToOnce` is only called once
jridgewell Oct 30, 2014
33f814a
Off wrapping callback, not the original
jridgewell Oct 30, 2014
0ca71a1
Return the result of listenTo in listenToOnce
gyeates Nov 3, 2014
ece73c0
Make backbone-min.js available for bower
romamatusevich Nov 8, 2014
a35d88e
listen for invalid, not error
robrobbins Nov 11, 2014
185c8df
Fix unescaped script tag in backbone.localstorage. Closes #3379
akre54 Nov 12, 2014
cd22d59
bump underscore dependency to 1.6.0 due to #3331
akre54 Nov 12, 2014
51084c6
use number of assertions, not another var
robrobbins Nov 12, 2014
545a12e
Order should trigger a sort iff order was changed
Nov 13, 2014
620639a
Cleanup redundant variables in sort
akre54 Nov 13, 2014
04f912c
Code style cleanup in collection tests and add an extra sort test
akre54 Nov 13, 2014
8569f89
Collection.add accepts negative indexes for the `at` option
Nov 14, 2014
407705f
Ensure iframe hash is set.
braddunbar Nov 16, 2014
d65fd24
Add a comment about iframe history.
braddunbar Nov 16, 2014
0ccb71f
draft changelog for backbone 1.2.0
akre54 Aug 29, 2014
d550b8b
Leave out unnecessary trailing slash.
braddunbar Nov 26, 2014
18ae321
Specify npm included files explictly in package.json
megawac Nov 29, 2014
2e1b8b8
change "overriden" to "overridden" in two places.
brianjscoles Dec 8, 2014
19f9905
Merge branch 'master' into bb-120
akre54 Feb 13, 2015
1af5092
correct number of Underscore model methods in sidebar
akre54 Feb 13, 2015
401fdbd
Merge branch 'master' into bb-120
akre54 Mar 20, 2015
4463e9b
build latest version and compile docs
akre54 Mar 20, 2015
f9c03a2
note about commonjs / jquery
akre54 Apr 18, 2015
6ea3bfb
merge in master branch
akre54 May 13, 2015
c731f72
Merge branch 'master' into bb-120
akre54 May 13, 2015
c66c211
document async success callback in changelog
akre54 May 13, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backbone-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion backbone-min.map

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 1.1.2
// Backbone.js 1.2.0

// (c) 2010-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
// Backbone may be freely distributed under the MIT license.
Expand Down Expand Up @@ -40,7 +40,7 @@
var slice = array.slice;

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

// For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
// the `$` variable.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "backbone",
"version" : "1.1.2",
"version" : "1.2.0",
"main" : "backbone.js",
"dependencies" : {
"underscore" : ">=1.7.0"
Expand Down
2 changes: 1 addition & 1 deletion component.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name" : "backbone",
"version" : "1.1.2",
"version" : "1.2.0",
"description" : "Give your JS App some Backbone with Models, Views, Collections, and Events.",
"keywords" : ["model", "view", "controller", "router", "server", "client", "browser"],
"repo" : "jashkenas/backbone",
Expand Down
1,616 changes: 987 additions & 629 deletions docs/backbone.html

Large diffs are not rendered by default.

22 changes: 10 additions & 12 deletions docs/backbone.localStorage.html
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,18 @@
<a class="large" href="javascript:void(0);">Jump To &hellip;</a>
<a class="small" href="javascript:void(0);">+</a>
<div id="jump_wrapper">
<div id="jump_page_wrapper">
<div id="jump_page">


<a class="source" href="backbone.localStorage.html">
backbone.localStorage.js
</a>
<div id="jump_page">


<a class="source" href="todos.html">
todos.js
</a>
<a class="source" href="backbone.localStorage.html">
backbone.localStorage.js
</a>


</div>
<a class="source" href="todos.html">
todos.js
</a>

</div>
</li>
</ul>
Expand Down
24 changes: 6 additions & 18 deletions docs/docco.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
}

@font-face {
font-family: 'roboto-black';
src: url('public/fonts/roboto-black.eot');
src: url('public/fonts/roboto-black.eot?#iefix') format('embedded-opentype'),
url('public/fonts/roboto-black.woff') format('woff'),
url('public/fonts/roboto-black.ttf') format('truetype');
font-family: 'novecento-bold';
src: url('public/fonts/novecento-bold.eot');
src: url('public/fonts/novecento-bold.eot?#iefix') format('embedded-opentype'),
url('public/fonts/novecento-bold.woff') format('woff'),
url('public/fonts/novecento-bold.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}
Expand Down Expand Up @@ -67,17 +67,14 @@ h1, h2, h3, h4, h5, h6 {
color: #112233;
line-height: 1em;
font-weight: normal;
font-family: "roboto-black";
font-family: "novecento-bold";
text-transform: uppercase;
margin: 30px 0 15px 0;
}

h1 {
margin-top: 40px;
}
h2 {
font-size: 1.26em;
}

hr {
border: 0;
Expand Down Expand Up @@ -183,18 +180,9 @@ ul.sections > li > div {
display: block;
}

#jump_page_wrapper{
position: fixed;
right: 0;
top: 0;
bottom: 0;
}

#jump_page {
padding: 5px 0 3px;
margin: 0 0 25px 25px;
max-height: 100%;
overflow: auto;
}

#jump_page .source {
Expand Down
Binary file added docs/public/fonts/novecento-bold.eot
Binary file not shown.
Binary file added docs/public/fonts/novecento-bold.ttf
Binary file not shown.
Binary file added docs/public/fonts/novecento-bold.woff
Binary file not shown.
Loading