Commit Graph

3033 Commits

Author SHA1 Message Date
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
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
Justin Ridgewell
13de636df1 Ensure fetch'd data is only parsed once 2015-05-30 02:27:51 -04:00
Justin Ridgewell
415c3a7a13 Collection#set shouldn't parse
Fixes #3636, #2824.

Reverts #1407.
2015-05-30 02:27:51 -04:00
Adam Krebs
2195406c4b typo: elements -> events 2015-05-27 22:34:44 -04:00
Jeremy Ashkenas
d1a459a234 Merge pull request #3640 from akre54/document-delegate-change
Document delegateEvents change from #3060
2015-05-27 14:41:52 -04:00
Adam Krebs
15215706f1 Document delegateEvents change from #3060 2015-05-27 14:36:54 -04:00
Adam Krebs
cc2581598d correct "polymorphic" typo 2015-05-27 12:14:00 -04:00
Graeme Yeates
dbcfc15b8a Merge pull request #3639 from jridgewell/collection-removeModels
Fix syntax error
2015-05-27 11:55:40 -04:00
Justin Ridgewell
196cee7289 Fix syntax error. 2015-05-27 11:53:37 -04:00
Jeremy Ashkenas
2e465970e0 Merge pull request #3637 from jridgewell/collection-removeModels
Return removed models from #_removeModels
2015-05-27 11:49:44 -04:00
Justin Ridgewell
e926394658 #_removeReference now removes references 2015-05-27 11:44:27 -04:00
Justin Ridgewell
61e765087d Test that Collection#remove _only_ returns removed models
Add (currently) failing tests for #3512.
2015-05-27 11:42:42 -04:00
Justin Ridgewell
a910bace09 Collection#remove returns removed model 2015-05-27 01:00:45 -04:00
Justin Ridgewell
46c90648c3 Return removed models from #_removeModels 2015-05-27 01:00:00 -04:00
Justin Ridgewell
7bf2d68c04 Merge pull request #3609 from akre54/modelid-docs
Document Collection#modelId
2015-05-26 17:52:57 -04:00
Jeremy Ashkenas
165034b861 Merge pull request #3628 from jridgewell/model-fetch-style
Model#fetch parse option
2015-05-26 17:34:04 -04:00
Jeremy Ashkenas
751d6b19a3 Merge pull request #3629 from jridgewell/model-save-style
Model#save style
2015-05-26 17:33:20 -04:00
Jeremy Ashkenas
17adb0bbd3 Merge pull request #3630 from jridgewell/test-view
Test View
2015-05-26 17:31:43 -04:00
Jeremy Ashkenas
e78e9a2a07 Merge pull request #3627 from jridgewell/model-set-style
Model#set style
2015-05-26 16:00:55 -04:00
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
dc9b8f152f Don't mutate attrs 2015-05-24 02:04:24 -04:00
Justin Ridgewell
3601b80b98 Cleanup Model#save success callback 2015-05-24 02:04:24 -04:00
Justin Ridgewell
0a091770b0 Default parse during extend 2015-05-24 02:04:24 -04:00
Justin Ridgewell
39a596efae Make it apparent what temporarily needs waited attributes 2015-05-24 02:04:24 -04:00
Justin Ridgewell
4d70b87185 Declare variable when it's used 2015-05-24 00:30:51 -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