Permalink

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Mar 20, 2013
@jashkenas Rebuilding minified release with --mangle a50000d
@jashkenas Adding url/urlRoot options to the Model#constructor documentation. 12ae2b2
@madebyherzblut madebyherzblut Fix typo in collection.set example
The example for collection.set called an undefined function "update".
c80cdde
@knowtheory knowtheory Merge pull request #2398 from tranver/master
Fix typo in collection.set example
d353b4c
@wyuenho wyuenho Update Collection#fetch's doc to refer to Collection#set 953df7d
@knowtheory knowtheory Merge pull request #2397 from wyuenho/collection-fetch-doc-fix
Update Collection#fetch's doc to refer to Collection#set
9710d0e
@wyuenho wyuenho Doc fix for error callback signature for Model#fetch and Collection#f…
…etch
69707fe
@wyuenho wyuenho Merge branch 'master' of git://github.com/documentcloud/backbone into…
… error-callback-doc-fix
b3caaba
@tgriesser tgriesser Consolidating references to silenced changes. c122375
@braddunbar braddunbar Merge pull request #2399 from wyuenho/error-callback-doc-fix
Error callback doc fix
f44defc
@jashkenas Merge pull request #2400 from tgriesser/removing-silent-docs
Consolidating references to silenced events
a51c874
@jashkenas rewording events paragraph 31cff06
@jcarbo jcarbo added "retinafied" favicon 7e0e3e3
@tgriesser tgriesser Merge pull request #2406 from jcarbo/retinafy-favicon
added "retinafied" favicon
4a40653
@tgriesser tgriesser Fixing documentation for Collection#fetch 05089f6
@caseywebdev caseywebdev Merge pull request #2408 from tgriesser/fetch-docs
Fixing documentation for Collection#fetch
ee8739a
@philfreo philfreo Removing invalid 'set' option in 'Collection#fetch' docs 22305a4
@philfreo philfreo lowercase instance var in example code 8d41eaa
@caseywebdev caseywebdev Merge pull request #2411 from philfreo/another-typo
lowercase instance var in example code
5c183b2
@caseywebdev caseywebdev Merge pull request #2410 from philfreo/master
Removing invalid 'set' option in 'Collection#fetch' docs
495eaae
@philfreo philfreo more lowercasing of instance vars e638d76
@philfreo philfreo more lowercasing of instance vars 7df8c30
Commits on Mar 21, 2013
@philfreo philfreo fixing minor typos 0b27f87
@tgriesser tgriesser Merge pull request #2412 from philfreo/another-typo
Minor typo fixes to docs.
3a94f4e
@caseywebdev caseywebdev Revert "lowercase instance var in example code"
This reverts commit 8d41eaa.
c3c48e8
Commits on Mar 22, 2013
@braddunbar braddunbar Fix #2417 - Use apply to implement slice. 42d3588
Commits on Mar 23, 2013
@gsamokovarov gsamokovarov Don't attach url if passed as an option in Model e91b36c
@braddunbar braddunbar Merge pull request #2420 from gsamokovarov/model-no-url-option
Don't attach url if passed as an option in Model
dd49c6a
Commits on Mar 25, 2013
@braddunbar braddunbar Fix #2422 - Clarify docs about changed attributes. 795b442
@tgriesser tgriesser Merge pull request #2423 from braddunbar/model-changed
Fix #2422 - Clarify docs about changed attributes.
820182b
@gsamokovarov gsamokovarov Don't accept urlRoot from Model and url from Collection 3bfbcd4
@gsamokovarov gsamokovarov Remove the redundant documentation bits 5b8f794
Commits on Mar 26, 2013
@jashkenas Merge pull request #2426 from gsamokovarov/no-url-no-urlroot
Don't accept urlRoot from Model and url from Collection
dd85833
@zyzniewski zyzniewski fixed documentation anchor 297b152
@braddunbar braddunbar Merge pull request #2429 from zyzniewski/master
Fixed documentation anchor for Collection#fetch
61243f5
@prust prust Fixed tiny typo in FAQ c5a791b
@braddunbar braddunbar Merge pull request #2433 from CSNW/faq-typo
Fixed tiny typo in FAQ
68ffa87
Commits on Mar 27, 2013
@theoreticaLee theoreticaLee Add license to package.json 9b6ee41
Sam Breed Merge pull request #2435 from theoreticaLee/master
Add backbone's license info to package.json
dc2521d
Commits on Mar 28, 2013
Alex McPherson Clarification on optional parameters and trailing slashes in routes d…
…ocumentation
81585a0
@jashkenas Merge pull request #2445 from alexmcpherson/master
Documentation paragraph for a common misconception about routes with trailing slashes.
9c9463c
Commits on Mar 29, 2013
Sam Breed adding missing comma 7adeeaf
@braddunbar braddunbar Fix #2438 - Indicate shallow copying. 0e7ac5a
@caseywebdev caseywebdev Fix #2446 `save` should always `set` with `validate: true` by default 8e7208e
@caseywebdev caseywebdev Don't validate twice in 4db2676
Commits on Mar 30, 2013
@tgriesser tgriesser very minor code formatting 624a507
Commits on Apr 01, 2013
@gsamokovarov gsamokovarov Remove leftover attachable url documentation 5e68330
@braddunbar braddunbar Merge pull request #2454 from gsamokovarov/remove-leftover-url-docs
Remove leftover attachable url documentation
4b7b0d1
Commits on Apr 02, 2013
@williamhc williamhc return from Backbone.history.navigate whether a route was matched. 746aa1d
Commits on Apr 03, 2013
@braddunbar braddunbar Phantomjs 1.9.0-1. 9116dde
Commits on Apr 04, 2013
@caseywebdev caseywebdev `set` respects input order in absence of comparator d12e4cf
@jashkenas Merge pull request #2455 from williamhc/patch-1
return from Backbone.history.navigate whether a route was matched.
852aaf6
@jashkenas Merge pull request #2085 from caseywebdev/reorder
Fix #2068 - `set` respects input order in absence of comparator
165849e
@jashkenas Fixes #2431, #2452, a little bit lex talionis, but appropriate, I think. afb9dfc
Commits on Apr 08, 2013
@braddunbar braddunbar Fix #2458 - Options are not attached to views. a22cbc7
Commits on Apr 09, 2013
@jashkenas Merge pull request #2460 from braddunbar/view-options
Fix #2458 - Options are not attached to views.
bc82a4d
@braddunbar braddunbar Dispense with View#options merging. 51eed18
@jashkenas Merge pull request #2461 from braddunbar/view-options
Dispense with View#options merging.
4e72ab1
Commits on Apr 12, 2013
@caseywebdev caseywebdev Add failing merge with defaults test f61bd29
@caseywebdev caseywebdev Fix #2471 merging with defaults 8141f4f
Commits on Apr 18, 2013
@jashkenas Merge pull request #2477 from caseywebdev/merge-defaults
Fix #2471 merging with defaults
c3a1af0
Commits on Apr 22, 2013
@runemadsen @tgriesser runemadsen + tgriesser add if statement and add passing test 2caf748
@runemadsen @tgriesser runemadsen + tgriesser trigger request event only if model extends Backbone.Events, and fix …
…whitespace
6d72e1b
@tgriesser tgriesser Allow non-model object as second argument, with test. 32743e6
@braddunbar braddunbar Revert non-model sync commits.
Revert "Allow non-model object as second argument, with test."
This reverts commit 32743e6.

Revert "trigger request event only if model extends Backbone.Events, and fix whitespace"
This reverts commit 6d72e1b.

Revert "add if statement and add passing test"
This reverts commit 2caf748.
dc5de01
Commits on Apr 26, 2013
@knowtheory knowtheory Updating license to reflect DocumentCloud's correct attribution. 921799c
@knowtheory knowtheory Fixing licensing typo. 6b3e52c
Commits on May 01, 2013
@caseywebdev caseywebdev Fix bug causing mutations while merging with nested models
Again, I'm not a huge fan of this solution to the merge + defaults problem, but
this will work until somone more clever than I figures out what to do or we
reevaluate the whole existance checking ordeal.
fd0cb96
Commits on May 08, 2013
@caseywebdev caseywebdev Don't mutate options in `add` or `set` 1e1e065
@caseywebdev caseywebdev Force add true and remove false flags in `add`, merge optional 61987e8
Commits on May 15, 2013
@fixe fixe Added missing word to emulateHTTP comment 12c6595
@caseywebdev caseywebdev Fix same mutation problem with existing/non-existing mix of models 6ac7704
Commits on May 17, 2013
@tgriesser tgriesser Merge pull request #2539 from fixe/patch-1
Added missing word to emulateHTTP comment
f69f1e6
Commits on May 21, 2013
@jerryorr jerryorr Update PATCH/xhr check so that IE9 works
Fixes #2476
971173c
@jashkenas Merge pull request #2550 from jerryorr/master
Update PATCH/xhr check so that IE9 works
9be5f2f
Commits on May 28, 2013
@braddunbar braddunbar Fix #2538 - Only transition if both pushState and hashChange are requ…
…ested.
3567dc6
@tgriesser tgriesser Merge pull request #2565 from braddunbar/hashchange-false
Fix #2538 - Only transition if both pushState and hashChange are requested.
fc8c2a9
Commits on May 29, 2013
@braddunbar braddunbar Fix #2569 - Add repository to package.json. b8d8db1
@braddunbar braddunbar Do not load the hash as a fallback. 5f93ba7
Sam Breed Fix #2554 - adding clarification about route behavior 744dbaf
Commits on May 30, 2013
@jashkenas Merge pull request #2572 from braddunbar/no-hash-fallback
Do not load the hash as a fallback.
e589f92
Commits on Jun 05, 2013
@recurse recurse Document listenTo's implicit 'this' context.
That the context to the callback in listenTo is this, is only
documented as issue discussions on github. This adds explicit
documentation of that semantic.

See Issue #1999
9b9046e
@recurse recurse Fix a small typo in patch. 47499da
@braddunbar braddunbar Tweak context comment. 98a35b8
@braddunbar braddunbar Fix #2535 - Update changelog with Model#set changes. 1c88d71
@caseywebdev caseywebdev Merge pull request #2591 from braddunbar/model-set-changelog
Fix #2535 - Update changelog with Model#set changes.
b2ab90a
@caseywebdev caseywebdev Avoid double _validate calls in _prepareModel dec76e1
Commits on Jun 09, 2013
@caseywebdev caseywebdev Add "difference" collection method
Seeing as "without" is already included and "difference" is just a different API
for without, I see no reason for not adding it. Prior to this commit, one would
have to do `collection.without.apply(collection, other.models)` which is
definitely not as nice as `collection.difference(other.models)`. Useful for
cases like `availableSeats = allSeats.difference(reservedSeats.models)`.
9dbffe3
Commits on Jun 10, 2013
@caseywebdev caseywebdev Ensure Collection#get does not return a false negative during the cha…
…nge:attr event
6f9c1ec
@caseywebdev caseywebdev Merge pull request #2602 from caseywebdev/fallback-get
Ensure Collection#get does not return a false negative during the change:attr event
4149557
Commits on Jun 11, 2013
@braddunbar braddunbar Fix #2606 - Collection#create success arguments. fa411d6
@caseywebdev caseywebdev Merge pull request #2609 from braddunbar/collection-create
Fix #2606 - Collection#create success arguments.
bfc6d74
Commits on Jun 13, 2013
@gsamokovarov gsamokovarov Use Collection#where for TodoList#remaining
Using `Collection#where` for both speed and symmetry.
55388e1
@braddunbar braddunbar Merge pull request #2613 from gsamokovarov/todo-difference
Use Collection#where for TodoList#remaining
4b417c1
Commits on Jun 24, 2013
@ingermaa ingermaa Changed link to test at backbone.org 48e6a8e
@braddunbar braddunbar Merge pull request #2632 from ingermaa/master
Fixed broken link to test page
c523222
@jashkenas slightly clarifying collection.model docs 3a8204d
@jashkenas Merge branch 'master' of github.com:documentcloud/backbone a1337f1
Commits on Jun 26, 2013
@jashkenas Gawker Media as an example app 0956a81
@kjbekkelund kjbekkelund Removed unnecessary variable 'matched' 2f77349
@caseywebdev caseywebdev Merge pull request #2637 from kjbekkelund/remove-unnecessary-variable
Removed unnecessary variable 'matched'
cbdcbfa
Commits on Jul 02, 2013
@braddunbar braddunbar Be explicit about boolean "trigger" option.
Closes #2647.
b4455a6
Commits on Jul 03, 2013
@braddunbar braddunbar Add missing comma. 8c9a6ad
@braddunbar braddunbar QUnit 1.12.0 0925996
@jashkenas Merge pull request #2652 from braddunbar/qunit
QUnit 1.12.0
f9e34da
Commits on Jul 04, 2013
@jakemcguire jakemcguire Fixed typo: missing s in "asynchronous" d651f83
@jakemcguire jakemcguire Revert "Fixed typo: missing s in "asynchronous""
This reverts commit d651f83.
0ec1c7e
@eastbayjake eastbayjake Fixed typo: missing s in "asynchronous" dd92f4d
Commits on Jul 05, 2013
@braddunbar braddunbar Merge pull request #2655 from eastbayjake/master
Fixed typo in index.html
a173ebf
@braddunbar braddunbar Replace non-standard #substr with #slice. 25f3949
@braddunbar braddunbar Fix #2656 - Trailing slash on root. 0a662d6
@braddunbar braddunbar Never include trailing slash on the root. 151bd73
@braddunbar braddunbar Avoid calling pushState with an empty url. 15b7d77
Commits on Jul 06, 2013
@braddunbar braddunbar Merge pull request #2659 from braddunbar/trailing-root
Fix #2656 - Trailing slash on root.
9e0f188
Commits on Jul 07, 2013
@jashkenas Moving over urls for administration. f252091
@jashkenas Doccloud credit in the README ae90da0
Commits on Jul 12, 2013
@braddunbar braddunbar Fix #2670 - Document route events. a9da67a
@jashkenas Merge pull request #2671 from braddunbar/route-events
Fix #2670 - Document route events.
0b004c0
Commits on Jul 13, 2013
@skaterdav85 skaterdav85 whitespace 1c35102
Commits on Jul 14, 2013
@braddunbar braddunbar Merge pull request #2672 from skaterdav85/master
whitespace
934300c
Commits on Jul 19, 2013
@carldanley carldanley fix spelling error in documentation cc9f466
@jashkenas Merge pull request #2681 from carldanley/master
fix spelling error in documentation
517624d
Commits on Jul 29, 2013
@jashkenas Adding eLife Lens as an example app. 20b8cff
Commits on Jul 30, 2013
@jashkenas Adding a do-not-post-if section to CONTRIBUTING 06433f5
@jashkenas Giving CONTRIBUTING a more accurate title. f305eba
@hartzler hartzler remove null options guard
no need to check for null options here as the first line of the
function already assumes an options object.
7b7dd1b
@braddunbar braddunbar Merge pull request #2702 from hartzler/remove-unreachable-code
remove null options guard
8aa4db1
Commits on Aug 01, 2013
@jashkenas Fixes #2684 -- tweak toJSON docs. 37b5abc
@jashkenas Merge branch 'master' of https://github.com/jashkenas/backbone 8afd143
Commits on Aug 02, 2013
@akre54 akre54 use shorter form for comparator 1acfedd
Commits on Aug 06, 2013
@odigity odigity fixed two stand-out typos :) 633591e
@braddunbar braddunbar Restore "elan". 027e8f6
Commits on Aug 07, 2013
@caseywebdev caseywebdev Merge pull request #2706 from akre54/comparator-docs
Update comparator example in the docs
3a54b74
Commits on Aug 09, 2013
@braddunbar braddunbar Add docs for the View#template convention. e76646d
@braddunbar braddunbar Grammar, capitalization. b6fa46e
Commits on Aug 10, 2013
@braddunbar braddunbar Remove superfluous sentence. 6916d67
Commits on Aug 11, 2013
@braddunbar braddunbar Reword according to feedback. ace363c
Commits on Aug 21, 2013
@philfreo philfreo Fixing travis-ci badge after repo move be7862f
@caseywebdev caseywebdev Merge pull request #2728 from philfreo/patch-1
Fixing travis-ci badge after repo move
dc0f4cd
Commits on Aug 23, 2013
@douglascalhoun douglascalhoun (2x) new Collection -> new Backbone.Collection
Apologies in advance if I've misunderstood this.
44de0af
Commits on Aug 25, 2013
@caseywebdev caseywebdev Merge pull request #2732 from douglascalhoun/patch-1
(2x) new Collection -> new Backbone.Collection
eca5a96
Commits on Aug 30, 2013
@loc loc Fixing semantics of listeners hash 86170d9
Commits on Sep 07, 2013
@braddunbar braddunbar Add favicon to test/index.html a727009
@jashkenas Merge pull request #2745 from braddunbar/icon
Add favicon to test/index.html
f15b182
Commits on Sep 09, 2013
@akre54 akre54 remove Rakefile in favor of npm scripts 42ef5c7
@jashkenas Merge pull request #2749 from akre54/remove-rakefile
Remove Rakefile in favor of npm scripts
83d5074
Commits on Sep 11, 2013
@jashkenas Merge pull request #2740 from lowkaseo/listeners-rename
Fixing semantics of listeners hash
906f64f
@jashkenas More listen* var name tweaks. 2acf58e
@jashkenas Test from #2724 for listener cleanup. 42370dd
@jashkenas Merge pull request #2716 from braddunbar/template-docs
Add docs for the View#template convention.
476e764
@jashkenas Rewording #2716, docs for View#template. d68e007
@jashkenas Fixes #2714. Docs for {collection: c} in Model constructors. 4126a58
@jashkenas Fixes #2629, by removing the no-longer-used sortedIndex 6e5683f
@caseywebdev caseywebdev _listeners -> _listeningTo in event tests f9e434f
@jashkenas Fixing borked listeners test. #2724 22ab3ea
@jashkenas Merge branch 'master' of https://github.com/jashkenas/backbone 9e8fca0
@jashkenas Fixes #2724, leak with non-specific calls to stopListening. c198270
@jashkenas Fixes #2623 -- make 'invalid' events pass consisent arguments. Error …
…should go second, after the model in question.
10b0825
@jashkenas Adding test from #2619 8810453
Commits on Sep 12, 2013
@tgriesser tgriesser model#parse may no longer set the idAttribute 09e0cb3
@jashkenas Merge pull request #2755 from tgriesser/idAttr
model.parse may no longer set the idAttribute
cbbd944
@jashkenas Removing extra preparemodel calls. abcb3cf
@tgriesser tgriesser adding test case for #2612 cfe4492
Commits on Sep 16, 2013
@akre54 akre54 remove $(document).ready(...) from tests 2bd5df9
@akre54 akre54 remove jQuery-specific selector 866b84d
@braddunbar braddunbar Merge pull request #2761 from akre54/no-more-domready
Reduce jQuery dependencies in tests
4107366
Commits on Sep 19, 2013
@braddunbar braddunbar Fix #2765 - Strip hash and query for matching. f0572b0
vlad fix stack overflow exception fired in Collection.set with large colle…
…ction (with chrome/nodejs/v8)
b0884cf
@caseywebdev caseywebdev Merge pull request #2768 from jaguardev/master
fix stack overflow exception fired  in Collection.set with large collect...
3f2d565
@caseywebdev caseywebdev Style tweaks 98356bd
@caseywebdev caseywebdev Fix the set stack overflow case with the at option too 30f84f5
Commits on Sep 22, 2013
@jashkenas Adding ZocDoc as an example app 9d88234
Commits on Sep 23, 2013
@tgriesser tgriesser Merge pull request #2766 from braddunbar/navigate-hash
Fix #2765 - Strip hash and query for matching.
f6fa0cb
Commits on Sep 25, 2013
@caseywebdev caseywebdev Fix #2470 Do not mutate options in _prepareModel 5644a59
Commits on Oct 08, 2013
@akre54 akre54 shorter defaults in model ctor, shorter extends in history cdceabe
Commits on Oct 10, 2013
@jashkenas Merge pull request #2795 from akre54/shorter-defaults
Shorter defaults in model ctor
f627855
@jashkenas Merge pull request #2783 from caseywebdev/gh-2470
Fix #2470 Do not mutate options in _prepareModel
ce69368
@jashkenas Test for #2666. 9c47a78
@jashkenas Fixes #2428 -- set now returns added or merged models, so does add, s…
…o does push, so does unshift.
d9ac39f
@jashkenas Fixes #2401 – Adds mission statement-ish to introduction in the docs. a895d29
Commits on Oct 11, 2013
@jashkenas Firming up returning models from add and remove, plus tests. ac83197
@jashkenas Mild DRY-ing, and fixing logic error. 41f815d
@jashkenas Backbone.js 1.1.0 0a4399e