Commit Graph

3064 Commits

Author SHA1 Message Date
Justin Ridgewell
96b20d0707 Merge pull request #3710 from elgubenis/patch-2
typos
2015-07-13 10:52:02 -04:00
Linus-A. M. Gubenis
d6dd17c1ee typos 2015-07-13 09:50:11 -05:00
Graeme Yeates
1b1f50a194 Merge pull request #3709 from elgubenis/patch-1
Update collection.js
2015-07-13 10:45:25 -04:00
Linus-A. M. Gubenis
a37d30a3e1 Update collection.js 2015-07-13 09:43:55 -05:00
Adam Krebs
5f871af38a Merge pull request #3701 from craigmichaelmartin/master
improve readability for website
2015-07-06 17:36:28 -04:00
Craig Martin
e5dcf870ca improve readability 2015-07-06 15:31:26 -04:00
Justin Ridgewell
c3c3d6af68 Merge pull request #3690 from sophietk/collection-predicates-fix
Fix test for IE7/IE8 build
2015-06-24 08:22:09 -04:00
sophietk
0d43789682 Fix test for IE7/IE8 build 2015-06-24 10:25:45 +02:00
Justin Ridgewell
f55b4a2245 Merge pull request #3680 from akre54/multi-event-maps
Event maps should support multiple event syntax
2015-06-18 10:21:50 -04:00
Adam Krebs
28ea4b7785 fix addMethod examples 2015-06-12 15:12:15 -04:00
Adam Krebs
adf13ce852 Reorganize addUnderscoreMethods logic 2015-06-12 13:58:38 -04:00
Adam Krebs
67f063b9e5 Merge pull request #3682 from jridgewell/collection-modelProperty
modelProperty doesn't need to check for null
2015-06-12 13:49:47 -04:00
Justin Ridgewell
b60b7da710 modelProperty doesn't need to check for null
Since `#models` is filled with only model instances, there's no need to
check if model isn't `null`.

re: #3667.
2015-06-12 13:28:55 -04:00
Justin Ridgewell
2ddcd47571 Merge pull request #3667 from sophietk/collection-predicates
Collection methods with model-attributes-style predicates
2015-06-12 10:13:21 -04:00
sophietk
007a1b85f4 Collection methods from underscore (reject, filter, some, every, ...) take function, set of model attributes, or attribute name as argument
- Expand the use of inherited underscore methods, to iteratee as function, object or string
- Apply iteratee transformation to groupBy, countBy, sortBy, indexBy
2015-06-11 18:04:30 +02:00
Adam Krebs
6b927eb5e7 Event maps should support multiple event syntax 2015-06-10 17:33:03 -04:00
Justin Ridgewell
a3a0484156 Merge pull request #3679 from akre54/doc-improvements
Update comments throughout the code
2015-06-10 15:32:46 -04:00
Adam Krebs
2be220f28f Update comments throughout the code 2015-06-10 14:26:01 -04:00
Justin Ridgewell
dce3bdb16e Merge pull request #3646 from jashkenas/model-set-id-update
Update model's id with #get
2015-06-10 11:27:47 -04:00
Justin Ridgewell
ae4547d7d9 Merge pull request #3643 from CoolGoose/patch-1
updated TodoMVC link
2015-06-10 11:21:02 -04:00
Brad Dunbar
4b4c58f495 Merge pull request #3678 from jdalton/not-any-more
Replace `_.any` with `_.some`.
2015-06-10 06:22:04 -04:00
jdalton
c23f6132c0 Replace _.any with _.some. 2015-06-09 21:44:17 -07:00
Adam Krebs
9a9ba86037 Merge pull request #3670 from kkirsche/patch-1
Remove moot `version` property from bower.json
2015-06-09 16:31:26 -04:00
Justin Ridgewell
b91feacced Merge pull request #3675 from jdalton/no-bind-all
Remove the only `_.bindAll` use.
2015-06-09 15:49:54 -04:00
jdalton
74427c9e76 Remove the only _.bindAll use. 2015-06-09 11:01:57 -07:00
Kevin Kirsche
a1e89436c0 Remove moot version property from bower.json
Per bower/bower.json-spec@a325da3
2015-06-08 21:58:14 -04:00
Adam Krebs
edc26d1b36 document Collection#at with negative index 2015-06-08 09:58:27 -04:00
Jeremy Ashkenas
938a8ff934 Backbone 1.2.1 1.2.1 2015-06-04 18:09:12 -04:00
Jeremy Ashkenas
4148f54354 Merge pull request #3661 from paulfalgout/changelog-1.2.1
Draft changelog for Backbone 1.2.1
2015-06-04 18:04:30 -04:00
paulfalgout
2bfc84dfbc Draft changelog for Backbone 1.2.1 2015-06-04 13:46:11 -05:00
Adam Krebs
41ee3b7706 Merge pull request #3665 from jridgewell/collection-style-updates-2
Small Collection style updates
2015-06-03 22:00:29 -04:00
Justin Ridgewell
6215000047 Ungolf #create assignment 2015-06-03 21:58:53 -04:00
Justin Ridgewell
fdea29dfc8 Collection#add shouldn't parse a model instance
Fixes #3636, but in a backwards compatible way.
2015-06-02 14:06:50 -04:00
Andrey Kuzmin
ffa4fa597d Added failing test case 2015-06-02 13:58:13 -04:00
Justin Ridgewell
c95d9775e7 Revert "Merge pull request #3644 from jridgewell/collection-parse"
This reverts commit ff57b54cbb, reversing
changes made to 5ea158506f.
2015-06-02 13:55:21 -04:00
Jeremy Ashkenas
ff57b54cbb Merge pull request #3644 from jridgewell/collection-parse
Collection parse
2015-06-02 13:29:58 -04:00
Brad Dunbar
5ea158506f Merge pull request #3657 from jridgewell/ie6-test-false-positive
Fix failing IE6 test
2015-06-02 12:28:58 -04:00
Justin Ridgewell
f79e0bcf53 Fix failing IE6 test
It was a false positive. Our “location” parsing uses an A tag, which
doesn’t always work the way the real location parsing does.
2015-06-02 12:26:41 -04:00
Justin Ridgewell
1c6b7639ff Merge pull request #3613 from ahumphreys87/jsdomRouter
Fix opening and closing iframe document in jsdom
2015-06-02 11:09:47 -04:00
Brad Dunbar
46ec991782 Merge pull request #3656 from sroucheray/patch-1
Delete `main` property duplication
2015-06-01 15:58:33 -04:00
Stéphane Roucheray
591ab696db Delete main property duplication 2015-06-01 21:55:15 +02:00
Justin Ridgewell
80ef9d5fef Merge pull request #3655 from akre54/code-reorg
Code reorg
2015-06-01 12:02:20 -04:00
Adam Krebs
9be4131258 fix typo in once comment 2015-06-01 11:53:10 -04:00
Adam Krebs
565b2a1952 Move addUnderscoreMethods out of Backbone.Events, adjust comment now that array methods is only 1 method 2015-06-01 11:36:43 -04:00
Justin Ridgewell
cac05d4192 Merge pull request #3647 from jridgewell/collection-removeModels
Remove unnecessary assignment
2015-06-01 10:38:57 -04:00
Justin Ridgewell
a41a2056f9 Merge pull request #3603 from jridgewell/event-map-context
Juggle context param with event maps
2015-06-01 10:29:14 -04:00
Justin Ridgewell
53a4e701bb Remove unnecessary assignment 2015-05-31 01:54:37 -04:00
Justin Ridgewell
be7fc95964 Update model's id with #get 2015-05-31 00:34:12 -04:00
Graeme Yeates
6518a4c3f2 Merge pull request #3645 from jridgewell/variable-cleanup
Variable cleanup
2015-05-30 23:58:08 -04:00
Justin Ridgewell
1a8ed2efc6 Variable cleanup 2015-05-30 23:13:02 -04:00