Commit Graph

1378 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
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
Justin Ridgewell
dba0faad09 Collection#invoke should collect arguments
Fixes https://github.com/jashkenas/backbone/issues/3610.
2015-05-15 20:26:58 -04:00
Jeremy Ashkenas
bc73e25c5e Fixes #3512 2015-05-13 18:03:53 -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
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
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
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
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
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
Brad Dunbar
c8968853a2 Simplify. 2015-04-28 07:13:54 -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
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
b2a10afe4b Attempt to require jQuery in CommonJS, swallow error if not available 2015-03-20 18:30:12 -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
Jeremy Ashkenas
52973d3106 Merge pull request #3497 from akre54/no-length-cache
Remove the micro-opt of caching array length
2015-03-04 11:19:28 -05:00
Jeremy Ashkenas
3749b4017d Merge pull request #3508 from wettowelreactor/Fix#3470
Fix for issue #3470
2015-03-04 11:16:29 -05:00
Jeremy Ashkenas
e109f6d3e7 Merge pull request #3434 from braddunbar/decode-fragment
Decode unicode escapes without decoding `%25`.
2015-02-23 11:48:55 -05:00
Jeremy Ashkenas
a75709bc21 Merge pull request #3330 from megawac/_-opt
Optimize underscore proxy methods
2015-02-23 11:02:23 -05:00
Jeremy Ashkenas
caafa675d5 Merge pull request #3489 from jridgewell/trigger-for-slice
Use for-loop, instead of slice
2015-02-23 10:58:19 -05:00
Camille Roussel
f3c2ad2a3c Fix for issue #3470 2015-02-19 14:43:44 -08:00
Jeremy Ashkenas
89b1c58b4e Merge pull request #3504 from jridgewell/history-use
Use _use* properties to determine "wants" and "has"
2015-02-19 14:20:06 -05:00
Adam Krebs
499f6af3b9 allow Model#matches to take a predicate function 2015-02-19 09:39:00 -05:00
Justin Ridgewell
6d4a32856d Use _useHashChange to determine "wants" and "has" 2015-02-18 21:27:28 -05:00
Justin Ridgewell
0f25d20938 Use _usePushState to determine "wants" and "has" 2015-02-18 18:27:02 -05:00
Adam Krebs
4fd9da4f81 style tweaks 2015-02-17 19:24:35 -05:00
Adam Krebs
0df246e1f6 Merge pull request #3488 from platinumazure/include-updated-options-in-sync-callback
Include updated options in sync callbacks
2015-02-17 19:20:02 -05:00
Adam Krebs
d52b5f92ae Revert "History's root" 2015-02-17 17:41:06 -05:00
Adam Krebs
074544afe8 Merge pull request #3443 from jridgewell/history-root
History's root
2015-02-17 17:27:25 -05:00
Justin Ridgewell
22387234de Remove trigger with object's value prepend
Backbone still supports triggering with an object, but the args passed
to `#trigger` will not be prepended with the object's value.
2015-02-17 17:08:02 -05:00
Adam Krebs
659acb1478 Remove the micro-opt of caching array length. It's not actually effective and it makes the code uglier 2015-02-17 13:04:12 -05:00
Adam Krebs
19f9905fec Merge branch 'master' into bb-120
Conflicts:
	backbone.js
	docs/backbone.html
	test/collection.js
	test/events.js
2015-02-13 17:20:43 -05:00
Yousef Cisco
2d041d799d Updated Model to allow configuration of the cid prefix 2015-02-12 17:16:55 +00:00
Justin Ridgewell
2c8398483e Use for-loop, instead of slice
http://jsperf.com/trigger-with-for-loop-vs-slice
2015-02-10 22:05:58 -05:00