github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-04-30 03:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,152 Commits 4 Branches 35 Tags
f9e34da0da41bf2d04e03dc4172425ae16f2ddd9
Commit Graph

2152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Ashkenas
f9e34da0da Merge pull request #2652 from braddunbar/qunit 
QUnit 1.12.0
 2013-07-03 12:11:38 -07:00
Brad Dunbar
09259964df QUnit 1.12.0 2013-07-03 11:03:19 -04:00
Brad Dunbar
8c9a6ad8e7 Add missing comma. 2013-07-03 07:50:53 -04:00
Brad Dunbar
b4455a6fb6 Be explicit about boolean "trigger" option. 
Closes #2647.
 2013-07-02 12:37:20 -04:00
Casey Foster
cbdcbfa5f9 Merge pull request #2637 from kjbekkelund/remove-unnecessary-variable 
Removed unnecessary variable 'matched'
 2013-06-26 07:21:33 -07:00
Kim Joar Bekkelund
2f773493c1 Removed unnecessary variable 'matched' 2013-06-26 14:19:03 +02:00
Jeremy Ashkenas
0956a81f51 Gawker Media as an example app 2013-06-26 11:00:16 +02:00
Jeremy Ashkenas
a1337f1c2a Merge branch 'master' of github.com:documentcloud/backbone 2013-06-24 18:20:07 +02:00
Jeremy Ashkenas
3a8204d902 slightly clarifying collection.model docs 2013-06-24 18:19:05 +02:00
brad dunbar
c523222dba Merge pull request #2632 from ingermaa/master 
Fixed broken link to test page
 2013-06-24 07:11:25 -07:00
Jonas Ingermaa
48e6a8e9b9 Changed link to test at backbone.org 2013-06-24 17:07:40 +03:00
brad dunbar
4b417c1784 Merge pull request #2613 from gsamokovarov/todo-difference 
Use Collection#where for TodoList#remaining
 2013-06-13 08:52:06 -07:00
Genadi Samokovarov
55388e169d Use Collection#where for TodoList#remaining 
Using `Collection#where` for both speed and symmetry.
 2013-06-13 18:47:50 +03:00
Casey Foster
bfc6d74873 Merge pull request #2609 from braddunbar/collection-create 
Fix #2606 - Collection#create success arguments.
 2013-06-11 13:21:54 -07:00
Brad Dunbar
fa411d6240 Fix #2606 - Collection#create success arguments. 2013-06-11 16:15:07 -04:00
Casey Foster
41495579ec Merge pull request #2602 from caseywebdev/fallback-get 
Ensure Collection#get does not return a false negative during the change:attr event
 2013-06-10 09:13:11 -07:00
Casey Foster
6f9c1ece1e Ensure Collection#get does not return a false negative during the change:attr event 2013-06-10 09:32:02 -05:00
Casey Foster
9dbffe31f4 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)`.
 2013-06-09 12:37:24 -05:00
Casey Foster
dec76e1d86 Avoid double _validate calls in _prepareModel 2013-06-05 16:49:58 -05:00
Casey Foster
b2ab90a1d9 Merge pull request #2591 from braddunbar/model-set-changelog 
Fix #2535 - Update changelog with Model#set changes.
 2013-06-05 08:42:47 -07:00
Brad Dunbar
1c88d71356 Fix #2535 - Update changelog with Model#set changes. 2013-06-05 11:27:37 -04:00
Brad Dunbar
98a35b8fd3 Tweak context comment. 2013-06-05 11:08:32 -04:00
Andrae Muys
47499dade7 Fix a small typo in patch. 2013-06-05 14:37:45 +10:00
Andrae Muys
9b9046e048 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
 2013-06-05 10:49:30 +10:00
Jeremy Ashkenas
e589f924d8 Merge pull request #2572 from braddunbar/no-hash-fallback 
Do not load the hash as a fallback.
 2013-05-29 18:21:24 -07:00
Sam Breed
744dbafaf8 Fix #2554 - adding clarification about route behavior 2013-05-29 16:53:10 -04:00
Brad Dunbar
5f93ba79fa Do not load the hash as a fallback. 2013-05-29 14:59:53 -04:00
Brad Dunbar
b8d8db1249 Fix #2569 - Add repository to package.json. 2013-05-28 22:50:07 -04:00
Tim Griesser
fc8c2a9cb0 Merge pull request #2565 from braddunbar/hashchange-false 
Fix #2538 - Only transition if both pushState and hashChange are requested.
 2013-05-28 13:24:38 -07:00
Brad Dunbar
3567dc60f0 Fix #2538 - Only transition if both pushState and hashChange are requested. 2013-05-28 08:59:11 -04:00
Jeremy Ashkenas
9be5f2f486 Merge pull request #2550 from jerryorr/master 
Update PATCH/xhr check so that IE9 works
 2013-05-21 07:46:03 -07:00
Jeremiah Orr
971173c521 Update PATCH/xhr check so that IE9 works 
Fixes #2476
 2013-05-21 10:13:35 -04:00
Tim Griesser
f69f1e6d7e Merge pull request #2539 from fixe/patch-1 
Added missing word to emulateHTTP comment
 2013-05-17 06:19:16 -07:00
Casey Foster
6ac7704c30 Fix same mutation problem with existing/non-existing mix of models 2013-05-15 15:37:37 -05:00
Tiago Ribeiro
12c6595b03 Added missing word to emulateHTTP comment 2013-05-15 16:33:57 +02:00
Casey Foster
61987e8deb Force add true and remove false flags in add, merge optional 2013-05-08 00:33:34 -05:00
Casey Foster
1e1e0658ad Don't mutate options in add or set 2013-05-08 00:11:49 -05:00
Casey Foster
fd0cb9695d 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.
 2013-05-01 13:38:33 -05:00
Ted Han
6b3e52cd9d Fixing licensing typo. 2013-04-26 10:08:32 -05:00
Ted Han
921799c310 Updating license to reflect DocumentCloud's correct attribution. 2013-04-26 00:37:25 -05:00
Brad Dunbar
dc5de0190e Revert non-model sync commits. 
Revert "Allow non-model object as second argument, with test."
This reverts commit 32743e6b60.

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

Revert "add if statement and add passing test"
This reverts commit 2caf748651.
 2013-04-22 11:22:23 -04:00
Tim Griesser
32743e6b60 Allow non-model object as second argument, with test. 2013-04-21 21:02:37 -04:00
Rune Skjoldborg Madsen
6d72e1be35 trigger request event only if model extends Backbone.Events, and fix whitespace 2013-04-21 20:23:26 -04:00
Rune Skjoldborg Madsen
2caf748651 add if statement and add passing test 2013-04-21 20:23:25 -04:00
Jeremy Ashkenas
c3a1af0839 Merge pull request #2477 from caseywebdev/merge-defaults 
Fix #2471 merging with defaults
 2013-04-18 08:13:28 -07:00
Casey Foster
8141f4fbc2 Fix #2471 merging with defaults 2013-04-12 15:52:08 -05:00
Casey Foster
f61bd29d30 Add failing merge with defaults test 2013-04-12 10:54:53 -05:00
Jeremy Ashkenas
4e72ab1a94 Merge pull request #2461 from braddunbar/view-options 
Dispense with View#options merging.
 2013-04-09 09:19:30 -07:00
Brad Dunbar
51eed189bf Dispense with View#options merging. 2013-04-09 09:38:23 -04:00
Jeremy Ashkenas
bc82a4d370 Merge pull request #2460 from braddunbar/view-options 
Fix #2458 - Options are not attached to views.
 2013-04-08 19:29:59 -07:00