Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: jashkenas/backbone
base: 0.9.1
...
head fork: jashkenas/backbone
compare: 0.9.2
Commits on Feb 02, 2012
@jashkenas fixing changelog typo 9e3236d
@jashkenas editing the intro 7c10181
@jashkenas removing obsolete error case. a865aa4
@jashkenas Adding Wunderkit as an example app. 0afae7c
@jashkenas fixing typo in Wunderkit description ec7e422
Commits on Feb 03, 2012
@braddunbar braddunbar Refactor some tests.
* Use object for lastRequest to prevent errors.
* Ensure setDOMLibrary tests are cleaned up.
954da67
@jashkenas Merge pull request #940 from braddunbar/test-refactor
Refactor some tests.
65fa4f4
@braddunbar braddunbar Add tests for #906. 1d921d6
@jashkenas Adding the Khan Academy as an example app. dfeea84
@jashkenas Merge branch 'master' of github.com:documentcloud/backbone b8001f9
@braddunbar braddunbar fixes #946 - documentation for changes to `set` f63b5f5
@jashkenas Merge pull request #942 from braddunbar/wraperror
Add tests for #906.
db97d99
@braddunbar braddunbar Add tests for #908, #933. 3ef9c3a
@jashkenas Merge pull request #941 from braddunbar/test-933-908
Add tests for #908, #933.
2e40b49
@jashkenas Merge pull request #947 from braddunbar/upgrade-notes
fixes #946 - documentation for changes to `set`
8256cdf
@jashkenas removing old trajectory link. 2eb9c50
Commits on Feb 06, 2012
@jashkenas more documentation on upgrading and change events. b86cfeb
@braddunbar braddunbar fixes #964 - collection.get has consistent return 522e090
@jashkenas Merge pull request #965 from braddunbar/collection-get
fixes #964 - collection.get has consistent return
501799e
Commits on Feb 07, 2012
@jharding jharding Getting the hash value from location.href rather than location.hash a…
…s a workaround to the Firefox bug where location.hash is decoded.
402508d
@StanAngeloff StanAngeloff Tiny spelling error, no functional changes. b993441
@braddunbar braddunbar Merge pull request #968 from StanAngeloff/patch-1
Tiny spelling error, no functional changes.
be937ff
@jharding jharding Adding test for #967. 17459a3
Commits on Feb 08, 2012
@jashkenas Adding Collection#push, pop, shift, and unshift to the API, returning…
… references to the model. Fixing a too-unescaped regex.
e3ac6f8
@jashkenas Merge branch 'master' of github.com:documentcloud/backbone 2a92f71
Tim Ruffles added picklive's game client as an example app 639ce1a
@jashkenas moving picklive up, removing bittorrent from the examples... b1e2e69
Commits on Feb 09, 2012
@vlazzle vlazzle fixes #972 by cleaning up a messy conditional 3761d28
@braddunbar braddunbar Merge pull request #980 from vovik/new-master
fixes #972 by cleaning up a messy conditional
b3aed20
Commits on Feb 10, 2012
Peter Pistorius Fixes #984 417bcb9
@braddunbar braddunbar Merge pull request #985 from peterp/patch-1
`sort` and `sortBy` are incorrectly swopped in collection.comparator docs
178ae27
Commits on Feb 11, 2012
@knowtheory knowtheory Adding sidebar items for github repo and annotated source, as well as…
… a reference to Backbone's license file to documentation.
3d9d834
Commits on Feb 13, 2012
Otto Allmendinger unify dashes in index.html
use en-dash (U+2013) instead of hyphen-minus (U+002D) in index.html
navigation
e0b2449
@jashkenas Merge pull request #994 from OttoAllmendinger/master
cosmetic fix for index.html
af4fdb3
@jashkenas Much asked-for change. Instead of throwing an early error when adding…
… duplicate models, Backbone will simply skip them instead.
18fba57
@jashkenas resolving merge with master. a603e5a
Commits on Feb 14, 2012
@dukex dukex added qunit toolbar 63188db
@braddunbar braddunbar Merge pull request #1001 from vertigem/feature/qunit-toolbar
added qunit toolbar
1406ef1
@bmaland bmaland Fix signature of urlRoot in documentation c2a0895
@jashkenas Merge pull request #1006 from bmaland/docs
Fix signature of urlRoot in documentation
b9e36f0
@braddunbar braddunbar `on` is a noop if no callback is provided 8b285c6
@jashkenas Merge pull request #1008 from braddunbar/missing-callback
`on` is a noop if no callback is provided
04e2e20
Peter Pistorius Changed:
`Accounts.reset(<%= ... %>)` to `accounts.reset(<%= ... %>)`
`Projects.reset(<%= ... %>)` to `projects.reset(<%= ... %>)`

As it's popular in JavaScript to capitalize constructors it might be confusing in this context.
742dde3
@peterp peterp fixes #1004 c4d53ab
Commits on Feb 15, 2012
@braddunbar braddunbar fixes #1003 - History is started before `navigate` 232c888
@wookiehangover wookiehangover adding test coverage for route precedence as per issue #996 8d8a359
@braddunbar braddunbar Merge pull request #1004 from peterp/patch-2
Proposed clarification in documentation:
cf93180
@jashkenas Merge pull request #1010 from braddunbar/history-start
fixes #1003 - History is started before `navigate`
16b37e7
@jashkenas Merge pull request #1011 from wookiehangover/issue996
adding test coverage for route precedence as per issue #996
e5db1c9
Commits on Feb 16, 2012
Otto Allmendinger fix error message on missing event callback 5071967
@jashkenas Merge pull request #1014 from OttoAllmendinger/master
fix error message on missing event callback
9587a1f
Commits on Feb 17, 2012
@ahamid ahamid small patch to allow passing options through reset to model initializer 79045c1
@braddunbar braddunbar Fixes #959 - Silent changes fire `'change:attr'`.
* Silent changes are tracked so `'change:attr'` can be
  fired next time `change` is called.
* Pending changes are tracked to prevent infinite loops
  and accurately reflect nested changes.
69b80f5
@braddunbar braddunbar Use `null` for uninitialized variables. 82ee97d
@braddunbar braddunbar Fixes #1016 - Expose `changed`.
* Expose `changed` as a public hash of changes.
* Initialize `changed`, `_pending`, and `_silent`
  in the constructor instead of checking in `set`.
* Ensure `changed` matches `attributes`.
afbca72
@braddunbar braddunbar documentation for `changed` 5f12967
@jashkenas Merge pull request #982 from braddunbar/change
Fixes #959 - Silent changes fire `'change:attr'`.
c6b2814
@hswolff hswolff fix instances of it's to its for proper grammar a4410ed
@braddunbar braddunbar Merge pull request #1022 from hswolff/grammar-fixes
fix instances of it's to its for proper grammar
6560ad8
@braddunbar braddunbar Correct more grammar. c8cbde2
Commits on Feb 18, 2012
@braddunbar braddunbar Clean up `Backbone.Events`.
* Refactor `Backbone.Events` for increased clarity.
* Update documentation to include multiple events.
* Use `event` consistently throughout.
f92fa9a
@jashkenas Merge pull request #1023 from braddunbar/events
Clean up `Backbone.Events`.
4de073c
@braddunbar braddunbar Use local references to `Model`, `View`, etc. e309848
Commits on Feb 19, 2012
@jashkenas Merge pull request #1024 from braddunbar/locals
Use local references to `Model`, `View`, etc.
a960794
Commits on Feb 22, 2012
@braddunbar braddunbar Fixes #1038 - Document changes to `view.$`. ef5835a
Commits on Feb 24, 2012
@mdreizin mdreizin Added ability to avoid an additional '$()' call in 'setElement' metho…
…d if current 'element' is already wrapped with '$()'
0d1d278
Commits on Feb 25, 2012
@jashkenas Merge pull request #1040 from braddunbar/$-docs
Fixes #1038 - Document changes to `view.$`.
41e9d1a
Commits on Feb 27, 2012
@OCannings OCannings Made Backbone.sync options parameter optional daea564
@jashkenas Merge pull request #1052 from Sid3Show/master
Fix to make Backbone.sync options parameter optional again
a91b325
@jashkenas fixing or= JS style for sync options. c9599d6
@jashkenas Merge pull request #1048 from marat-dreizin/master
Added ability to avoid an additional '$()' call in 'setElement' method if current 'element' is already wrapped with '$()'
b37a096
@braddunbar braddunbar Add a test for #1052. 111d5a1
@braddunbar braddunbar Add test for #1048. f8b37a8
@jashkenas merging in hash fixer for FF 07604de
@jashkenas Merge branch 'master' of github.com:documentcloud/backbone 54e284b
@jashkenas removing a test that is invalid in IE. 83d2918
@jashkenas adding additional router test f930b5f
@jashkenas merging async test. 5ef4921
@jashkenas Fixes #1053 -- updating comment to reflect changed style of validate() dca02ec
@braddunbar braddunbar Fix #986 - Undelegate events before changing `el`. 6c392fa
@jashkenas Merge pull request #1041 from braddunbar/undelegate
Fix #986 - Undelegate events before changing `el`.
77c12ac
@addyosmani addyosmani Updating with latest version from TodoMVC
As requested in #1044, here's the latest version of the Backbone.js
Todo app as rewritten by our project.

We started out with the 0.5 base and re-wrote it to cover some subtle
best practices we thought were important. Ours, like the current one
also uses the latest Backbone and jQuery 1.7.1. As part of the changes,
we also introduced two differences in the UX:

* When in edit mode, if a todo item is emptied and then blurred, the
item is removed. This contrasts with the current behaviour of the app
in the official repo at the moment which maintains the empty item in
place (albeit looking a little broken
http://addyosmani.com/gyazo/bbd4cd.png)

* We removed the tooltip occasionally seen when a user was trying to
add a new item. Having discussed this with developers frequently using
the Todo app as an initial point of reference, it was a consensus that
the notification didn't really offer that much value nor did it really
show anything that Backbone-specific worth keeping it in for.

We usually enforce examples separate concerns (Models, Views etc.) into
their own directories pre-build, but I've reformatted it to match the
structure your current app takes so that it can be more easily diffed.

I hope it's worth considering our version for a merge. We're happy to
take on any feedback needed to update it to address concerns you might
have.
3cf1bb4
Commits on Mar 01, 2012
@jashkenas adding attictv and codiqa as example apps 673d07b
Commits on Mar 03, 2012
@ewang ewang fix typo in index.html f422291
@braddunbar braddunbar Merge pull request #1065 from ewang/master
fix typo in index.html
1f40de7
Commits on Mar 06, 2012
@dira dira Updated documentation for validate #1063 c473066
@dira dira Documentation for set - mention that the validation is skipped when p…
…assing {silent: true}
9928dee
Commits on Mar 07, 2012
@jashkenas adding chaincal as an example app fdfe010
@jashkenas Merge branch 'master' of github.com:documentcloud/backbone 5db14ff
@paulmillr paulmillr Add links to software. 3c69806
@jashkenas Merge pull request #1079 from paulmillr/add-links-to-software
Add links to software.
b9c6ee9
Commits on Mar 09, 2012
@dira dira Added a note to javascript injection attacks when bootstrapping data #… 5d43483
Commits on Mar 12, 2012
@afeld afeld clean up tests to use fresh object instances for each run, and don't set
globals within test files
f499690
@jashkenas Merge pull request #1093 from afeld/test-cleanup2
clean up tests to use fresh object instances for each run and not set globals
6d85811
@jashkenas Merge pull request #1084 from dira/patch-3
Prevent javascript injection attacks when bootstrapping data #1034
b59fa6f
@jashkenas fixes #1073 -- document that sync can be overridden at the collection…
… or model level.
58b5a22
@jashkenas Merge pull request #1070 from dira/patch-1
Updated documentation for validate - #1063
2b849a9
@jashkenas fixes #1067, urlRoot vs collection.url() order 64f37ce
Commits on Mar 13, 2012
@dira dira Improved description. d5751d5
Commits on Mar 14, 2012
@lxb lxb Slight optimization for Events cache splitting Regex
- cache the regular expression used to separate the event string
- changed old eventSplitter to delegateEventSplitter to remove ambiguity
- http://jsperf.com/triggering
- not caching the regex is 85% slower on chrome linux i686
82eed08
@jashkenas Merge pull request #1097 from lxb/optimization-1
Slight optimization for Events, cache splitting Regex
44b40c1
@jashkenas Fixes #1098 9414513
@jashkenas Merge branch 'master' of github.com:documentcloud/backbone 7e82188
Commits on Mar 16, 2012
@jashkenas Merge pull request #1071 from dira/patch-2
Documentation for set - validation is skipped when passing {silent: true}
a3282f4
@hshoff hshoff Add airbnb mobile to examples 8b61975
@hshoff hshoff Fix typo ec8dc94
@jashkenas editing airbnb mobile 01fb414
Commits on Mar 17, 2012
@braddunbar braddunbar Fix #1105 - Add convenience overloads for `off`. fb27097
@braddunbar braddunbar Fix #1108 - document return value of `sync`. 84a7e35
Commits on Mar 18, 2012
@braddunbar braddunbar Fix #1057 - Save with wait validates model. 6948b59
Commits on Mar 19, 2012
@braddunbar braddunbar Fix #1112 - options.model sets collection.model. 9ffc84c
@jashkenas Merge pull request #1119 from braddunbar/collection-model
Fix #1112 - options.model sets collection.model.
315d67b
@jashkenas Merge pull request #1114 from braddunbar/save-wait-validate
Fix #1057 - Save with wait validates model.
e2e0a09
@jashkenas Merge pull request #1110 from braddunbar/off
Fix #1105 - Add convenience overloads for `off`.
5f41b88
@jashkenas Fixes #991. Add Collection#where for simple filters de599c1
@jashkenas Merge pull request #1021 from ahamid/reset_passes_options
small patch to allow passing options through reset to model initializer
7b6dbc8
Commits on Mar 20, 2012
@braddunbar braddunbar Document jqXHR return values. 0ae1627
Commits on Mar 21, 2012
@jashkenas Merge pull request #1111 from braddunbar/sync-docs
Fix #1108 - document return value of `sync`.
a554d6b
@jashkenas model.destroy() returns false if the model.isNew() e9e1abf
@jashkenas fixes #1030 -- save with wait:true with a synchronous Backbone.sync f4a1ebc
@jashkenas fixes #1092 -- use model.get( internally instead of raw access, for e…
…asier extension / overriding.
42ad7a6
@jashkenas Merge branch 'master' of https://github.com/addyosmani/backbone 561cb70
@jashkenas tweaking addy's todo changes. 9899a81
@jashkenas more comments, more better 4f8d790
@jashkenas more comments, more spacing, more better 56e1045
@jashkenas Backbone.js 0.9.2 863814e