Commit Graph

2977 Commits

Author SHA1 Message Date
Adam Krebs
61d18408ad Merge pull request #3625 from jridgewell/model-isValid-style
Use defaults in #isValid
2015-05-24 09:43:55 -04:00
Adam Krebs
68292f8c78 Merge pull request #3626 from jridgewell/model-changedAttributes-style
Un-golf #changedAttributes
2015-05-24 09:42:27 -04:00
Adam Krebs
a6731e1b4d Merge pull request #3631 from jridgewell/model-url
Grab id using #get in Model#url
2015-05-24 09:41:02 -04:00
Adam Krebs
d1b4779741 Merge pull request #3632 from jridgewell/view-style
View style
2015-05-24 09:38:21 -04:00
Justin Ridgewell
b5fd59e2fe Grab id using #get in #url
Also, use the same slash normalizing as Router and History
2015-05-23 20:44:43 -04:00
Justin Ridgewell
1f4fb29323 Un-golf #delegateEvents 2015-05-23 20:41:31 -04:00
Justin Ridgewell
8266bd4609 Remove unneeded assignment
Since 1.7, `_.pick` no longer throws on `null`
2015-05-23 20:41:03 -04:00
Justin Ridgewell
632a2b3b67 Use defaults in #isValid 2015-05-23 12:33:08 -04:00
Justin Ridgewell
cd11702167 Un-golf #changedAttributes 2015-05-23 12:29:00 -04:00
Graeme Yeates
f430fa0849 Merge pull request #3612 from jridgewell/collection-invoke
Collection#invoke should collect arguments
2015-05-16 01:55:36 -04:00
Justin Ridgewell
dba0faad09 Collection#invoke should collect arguments
Fixes https://github.com/jashkenas/backbone/issues/3610.
2015-05-15 20:26:58 -04:00
Adam Krebs
47932de7b2 fix spacing in index.html page, manually merge #3606 2015-05-15 13:48:38 -04:00
Adam Krebs
c6933404cb document Model#matches 2015-05-15 10:59:02 -04:00
Justin Ridgewell
18fdc4c801 s/updated/update/ event 2015-05-14 14:21:49 -04:00
Adam Krebs
22b92bf925 Merge pull request #3604 from craigmichaelmartin/href-fix
Update index.html
2015-05-14 09:58:32 -04:00
Craig Martin
45e8e55d64 Update index.html 2015-05-14 08:48:52 -04:00
Graeme Yeates
dfd2e5b188 Update documented underscore dependency 2015-05-13 23:49:04 -04:00
Jeremy Ashkenas
2b628d5f46 mo docs 2015-05-13 18:15:17 -04:00
Jeremy Ashkenas
1bde5c589c updating sizes and dates 2015-05-13 18:10:26 -04:00
Jeremy Ashkenas
e69efe7851 s/updated/update 2015-05-13 18:07:16 -04:00
Jeremy Ashkenas
6541698ff6 Backbone.js 1.2.0 (I think) 1.2.0 2015-05-13 18:05:59 -04:00
Jeremy Ashkenas
bc73e25c5e Fixes #3512 2015-05-13 18:03:53 -04:00
Jeremy Ashkenas
b45f0de146 mo docs 2015-05-13 18:01:56 -04:00
Jeremy Ashkenas
48d9b9ce57 rebuild, redoc 2015-05-13 17:44:24 -04:00
Jeremy Ashkenas
a1c65e2420 s/updated/update 2015-05-13 17:39:05 -04:00
Jeremy Ashkenas
3150eec295 merged in 'updated' 2015-05-13 17:37:54 -04:00
Jeremy Ashkenas
7ff4b3a212 Merge pull request #3602 from megawac/globs
Amend #3566 fix; global detection
2015-05-13 16:43:11 -04:00
Graeme Yeates
cebd831680 Amend #3566 fix; global detection
Amendment to 5a6ffcb873
2015-05-13 16:34:45 -04:00
Jeremy Ashkenas
5a6ffcb873 Fixes #3566 loading with '''ES6''' script loaders 2015-05-13 16:25:32 -04:00
Jeremy Ashkenas
6ef574669b Merge pull request #3594 from jridgewell/eventsApi-refinements
Refine eventsApi
2015-05-13 16:11:31 -04:00
Jeremy Ashkenas
6d1128f2bc redoc 2015-05-13 16:09:54 -04:00
Jeremy Ashkenas
683aa77f0c Merge pull request #3285 from akre54/bb-120
Draft changelog for Backbone 1.2.0
2015-05-13 16:09:16 -04:00
Adam Krebs
c66c211e70 document async success callback in changelog 2015-05-13 12:02:29 -04:00
Adam Krebs
c731f721f3 Merge branch 'master' into bb-120 2015-05-13 11:59:33 -04:00
Jeremy Ashkenas
4aa539d3db Merge pull request #3577 from jridgewell/destroy-zalgo
Always call success async
2015-05-13 11:19:39 -04:00
Adam Krebs
6ea3bfb665 merge in master branch 2015-05-13 11:10:03 -04:00
Justin Ridgewell
f2a2cd0fee Use an options object 2015-05-11 16:54:16 -04:00
Adam Krebs
77f34b4f6a bump docco version to 0.7.0 2015-05-06 08:00:18 -04:00
Justin Ridgewell
9ad11ddf80 Ensure #on and #off **never** alter callback list 2015-05-01 20:20:21 -04:00
Justin Ridgewell
020bec3b22 Refine eventsApi
Based off code from https://github.com/jashkenas/backbone/pull/3476
2015-05-01 20:20:21 -04:00
Adam Krebs
113d7ce32e Merge pull request #3590 from kuychaco/patch-6
Clarify reference to the parent constructor.
2015-04-30 10:56:58 -04:00
Katrina Uychaco
e345ebfaf8 Clarify reference to the parent constructor.
The parent's constructor is 'Function', which is the constructor that created parent. 
The comments refer to the parent constructor function, not it's constructor function (that is, the constructor that created it).
2015-04-29 21:45:26 -07:00
Adam Krebs
60d67dc4c9 Merge pull request #3583 from kuychaco/patch-1
Fix grammar in Helpers documentation.
2015-04-29 08:41:17 -04:00
Katrina Uychaco
6a075f2e15 Fix grammar in Helpers documentation.
Remove comma from comment. No changes to source code made.
2015-04-28 17:50:01 -07:00
Adam Krebs
bb8d26a3fa Merge pull request #3580 from braddunbar/match-root
If the root doesn't match, no routes can match.
2015-04-28 13:42:29 -04:00
Brad Dunbar
1eb03c8354 Clean up. 2015-04-28 07:17:15 -04:00
Brad Dunbar
c8968853a2 Simplify. 2015-04-28 07:13:54 -04:00
Brad Dunbar
24daf350e4 Use more descriptive test names. 2015-04-28 06:56:40 -04:00
Brad Dunbar
21180e7234 Handle roots with regex characters. 2015-04-28 06:55:10 -04:00
Brad Dunbar
c1e70a28aa If the root doesn't match, no routes can match. 2015-04-28 06:34:28 -04:00