Commit Graph

1280 Commits

Author SHA1 Message Date
Jeremy Ashkenas
cee30cf48c Merge pull request #1557 from iros/collection.parse
Initializing collection from raw data doesn't pass it through parse method
2012-08-20 07:44:57 -07:00
Jeremy Ashkenas
6782ba2f8e Merge pull request #1560 from braddunbar/aliases
Ensure that Collection proxies underscore aliases.
2012-08-20 06:50:55 -07:00
Brad Dunbar
952fb884f3 Ensure that Collection proxies underscore aliases.
Added the following aliases:

* collect
* foldl
* inject
* foldr
* head
* take
* tail
2012-08-17 22:42:55 -04:00
Jeremy Ashkenas
db9545c119 Merge branch 'master' of github.com:documentcloud/backbone 2012-08-17 09:49:25 -04:00
Jeremy Ashkenas
4e2da6692b Fixes #1554, removes FUD about _.template 2012-08-17 09:48:44 -04:00
Irene Ros
980f60e050 removing extra options check 2012-08-16 17:19:29 -04:00
Irene Ros
330f2ba182 adding model parsing for collections on initialization of a collection from raw data 2012-08-16 17:13:02 -04:00
Jeremy Ashkenas
3ae1af6df1 Merge pull request #1461 from braddunbar/view-dispose
Add View#dispose.
2012-08-15 14:11:47 -07:00
Brad Dunbar
971a5fb383 Add View#dispose. 2012-08-15 16:31:43 -04:00
Ted Han
71d0fe3dcc escape todo items. 2012-08-14 00:31:41 -05:00
Brad Dunbar
281014319d Tweak id/className test. 2012-08-08 11:40:54 -04:00
Jeremy Ashkenas
41333dfa90 Merge pull request #1520 from gsamokovarov/getvalue-id-classname
getValue for View::className and View::id
2012-08-08 08:34:01 -07:00
Genadi Samokovarov
51387ebc36 getValue for View::className and View::id 2012-08-02 01:18:46 +03:00
Jeremy Ashkenas
215805e2c6 Merge pull request #1519 from spicyj/ka
Update Khan Academy blurb and screenshot
2012-08-01 10:27:36 -07:00
Ben Alpert
abee26c5ef Update Khan Academy blurb and screenshot 2012-08-01 10:19:50 -07:00
Jeremy Ashkenas
28f0b6a21f Merge pull request #1518 from nullobject/master
Don't include everything into the npm package.
2012-07-31 05:26:45 -07:00
Josh Bassett
442a860aa7 Don't include everything into the npm package. 2012-07-31 12:51:26 +10:00
Jeremy Ashkenas
b75c3e1e70 Merge pull request #1512 from braddunbar/trigger-args-loop
Fix #1511 - Add a comment explaining performance concerns in `trigger`.
2012-07-27 08:27:34 -07:00
Brad Dunbar
9a81468be7 Tweak root normalization. 2012-07-27 10:38:52 -04:00
Brad Dunbar
037b3f529c Fix #1511 - Add a comment explaining performance concerns in trigger. 2012-07-27 08:53:25 -04:00
Jamie Rolfs
596b12b56b Added test case for trailing slashs changes to atRoot in Backbone.history.start() 2012-07-26 12:12:41 -06:00
Jamie Rolfs
3d6b20ca7a Normalizing root url on Backbone.History.start, consistently matching root url for atRoot in History.start regardless of trailing slash 2012-07-26 11:44:07 -06:00
Jamie Rolfs
86cffe9bc2 Fixed Backbone.History.navigate and Backbone.History.start so any url changes include a slash between the root and route fragment when using pushState 2012-07-26 09:54:54 -06:00
Jeremy Ashkenas
8b23c013b0 tweaking wordpress example 2012-07-25 11:22:16 -04:00
Jeremy Ashkenas
6fef16b351 Merge pull request #1503 from nb/example-wpcom
Adding WordPress.com as an example app
2012-07-25 08:17:15 -07:00
Nikolay Bachiyski
75befbbbe3 Adding WordPress.com as an example app 2012-07-25 18:04:42 +03:00
Jeremy Ashkenas
b5e32d4c2c Merge pull request #1498 from braddunbar/clarify-off
Fix #1494 - Clarify documentation for `off`.
2012-07-19 04:36:41 -07:00
Brad Dunbar
76bc9faf45 Fix #1494 - Clarify documentation for off. 2012-07-18 21:32:24 -04:00
Jeremy Ashkenas
6d880672d1 Merge pull request #1493 from braddunbar/consistency
Consistent use of `===` and `void 0`.
2012-07-18 11:15:37 -07:00
Brad Dunbar
ddefd21167 Consistent use of === and void 0. 2012-07-18 14:13:14 -04:00
Jeremy Ashkenas
9ef2b3cf5d Merge pull request #1492 from gsamokovarov/patch-3
Put short if statements on one line and add some whitespace
2012-07-18 07:21:35 -07:00
Genadi Samokovarov
9b7dd43c8f Put short if statements on one line and add some whitespace 2012-07-18 13:57:03 +03:00
Tim Branyen
9a12b7640f Merge pull request #1488 from tbranyen/master
reduced the extend function to a single return
2012-07-16 18:58:42 -07:00
tbranyen
5f57f8cca4 reduced extends to single return 2012-07-16 21:57:40 -04:00
Jeremy Ashkenas
07f2a68ae5 Merge pull request #1486 from mitya777/remove-extend
removed redundant extend
2012-07-16 14:42:32 -07:00
Dmitriy Fabrikant
131e169c93 removed redundant extend 2012-07-16 16:10:27 -04:00
Jeremy Ashkenas
f663ba6dcd updating airbnb example 2012-07-16 14:17:22 -04:00
brad dunbar
b6f1d5239a Merge pull request #1484 from bukhamseen/master
Update todo example
2012-07-14 14:02:34 -07:00
Hossein Bukhamsin
639819c7ef prefer on over bind 2012-07-14 12:29:54 +03:00
Brad Dunbar
d8477f4b45 Revert #1353 for further discussion.
This reverts commit 7054ca4a2a, reversing
changes made to 7828d6d22d.
2012-06-25 17:55:19 -04:00
Jeremy Ashkenas
d10b6ddcb7 adding Prose as a Backbone example. 2012-06-25 14:38:52 -04:00
Brad Dunbar
c18b7763f8 Add a test and tweak whitespace for #1448. 2012-06-25 08:33:27 -04:00
Brad Dunbar
6a8232a36e Merge pull request #1448 from ganmor/sortfix.
Move sort after merge.
2012-06-25 08:26:47 -04:00
Brad Dunbar
ff561ca206 Fix #1447 - model.save does not delete options.wait. 2012-06-25 07:39:48 -04:00
ganmor
6df4874f69 Move sort after merge 2012-06-25 10:37:46 +02:00
brad dunbar
cf805816e2 Merge pull request #1444 from christopherwright/master
Fix a few typos in documentation, and note that Rails >= 3.1 doesn't namespace to_json
2012-06-23 05:35:48 -07:00
Christopher Wright
17a373474a Fix typo - "Backbones's" should be "Backbone's" 2012-06-23 20:53:51 +10:00
Christopher Wright
7f375d8ade to_json doesn't include namespace by default for Rails>=3.1 2012-06-23 20:52:45 +10:00
Christopher Wright
a9e42aaf70 Fix typo, "models state" should be "model's state" 2012-06-23 16:19:12 +10:00
Jeremy Ashkenas
17189f3149 Merge pull request #1440 from braddunbar/save-invalid
Fix #1433 - Do not save invalid models.
2012-06-22 07:31:42 -07:00