2957 Commits

Author SHA1 Message Date
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
Justin Ridgewell
d7943fe4c0 Always call success async
Let's not [unleash
Zalgo](http://blog.izs.me/post/59142742143/designing-apis-for-asynchrony
).
2015-04-23 14:03:50 -04:00
Adam Krebs
f9c03a2a8f note about commonjs / jquery 2015-04-18 11:46:00 -04:00
Adam Krebs
8b46ffaf91 remove stray var in docs 2015-04-18 11:44:05 -04:00
Adam Krebs
24a5144367 Merge branch 'pull-3056' 2015-04-16 16:54:38 -04:00
Andrew Newdigate
f040208f5a Better documentation around the behaviour of once when multiple events are passed in. 2015-04-16 16:50:32 -04:00
Adam Krebs
442142be94 Merge pull request #3237 from akre54/haschanged-set
clarify docs around Model#changed and Model#hasChanged
2015-04-16 16:31:13 -04:00
Justin Ridgewell
c5857c8fd3 Merge pull request #3563 from adrianblynch/patch-1
Fix typo
2015-04-09 16:51:37 -04:00
Adrian Lynch
57a5df4d87 Fix typo 2015-04-09 21:48:43 +01:00
Adam Krebs
d27ad60b20 Merge pull request #3441 from balloob/chore-fix-documentation-for-router
Update documentation for Backbone.Router
2015-04-05 11:27:10 -04:00
Adam Krebs
eb974f737b Merge pull request #3548 from JustBlackBird/clean_bower_package
Remove unneeded files from bower package
2015-03-26 14:39:35 -04:00
Dmitriy Simushev
c42b38dc30 Remove unneeded files from bower package 2015-03-26 09:27:08 +00:00
Jeremy Ashkenas
43818cca12 Merge pull request #3542 from akre54/jq-require
Wrap commonjs jQuery require in a try-catch
2015-03-25 14:36:01 -04:00
Adam Krebs
4f58c5b5f1 move backbone.localstorage.html -> backbone.localStorage.html. Fixes #3545 2015-03-23 10:40:20 -04:00
Adam Krebs
b2a10afe4b Attempt to require jQuery in CommonJS, swallow error if not available 2015-03-20 18:30:12 -04:00
Adam Krebs
f475de8467 Add uglify-js as a dev-dependency in package.json 2015-03-20 11:51:21 -04:00
Adam Krebs
4463e9bbfc build latest version and compile docs 2015-03-20 11:48:39 -04:00
Adam Krebs
401fdbd02c Merge branch 'master' into bb-120
Conflicts:
	index.html
2015-03-20 11:44:34 -04:00
Adam Krebs
bf731534aa Merge pull request #3507 from akre54/matches-with-callback
Matches with predicate
2015-03-20 11:33:01 -04:00
Adam Krebs
126226382f Merge pull request #3537 from jashkenas/sauce
Update travis configuration
2015-03-16 13:48:24 -04:00
Graeme Yeates
a5cb5fba45 Update the sauce configuration 2015-03-16 10:00:46 -04:00