Commit Graph

1325 Commits

Author SHA1 Message Date
Brad Dunbar
33cdab412e Drop doubled test prefixes. 2012-09-05 08:52:27 -04:00
Brad Dunbar
00a69ccab3 Fix #1615 - Update localstorage code. 2012-09-04 18:15:39 -04:00
Jeremy Ashkenas
f4937ebdbd Merge pull request #1623 from braddunbar/transition-to-hashchange
Add test for transition to hashChange.
2012-09-04 14:16:10 -07:00
Brad Dunbar
f3be02e1e0 Add test for transition to hashChange. 2012-09-04 17:05:34 -04:00
Brad Dunbar
8a7076acf8 Fix #1619 - Streamline rootStripper implementation. 2012-09-04 16:19:24 -04:00
Jerome Lecomte
1efeae70de fix #1619: fix navigation when root is empty
broken by commit d015ef1118
2012-09-04 14:31:30 -04:00
Jeremy Ashkenas
16001ca9a9 Merge pull request #1605 from braddunbar/relative-url
pushState/replaceState takes a relative url.
2012-09-04 07:02:53 -07:00
Brad Dunbar
d015ef1118 pushState/replaceState takes a relative url. 2012-09-04 09:53:46 -04:00
Jeremy Ashkenas
d52c612b07 Merge pull request #1611 from braddunbar/collection-proxy
Avoid creation of extra array in collection proxy.
2012-09-04 05:50:35 -07:00
Jeremy Ashkenas
4beaf2fdf0 Merge pull request #1610 from braddunbar/test-index
test/{test.html -> index.html}
2012-09-04 05:49:44 -07:00
brad dunbar
6f39005169 Merge pull request #1614 from aeosynth/master
update extend comment
2012-09-03 16:39:08 -07:00
James Campos
1206fbe513 update comment 2012-09-03 15:41:33 -07:00
Brad Dunbar
81669f51a1 test/{test.html -> index.html} 2012-09-02 14:37:52 -04:00
Brad Dunbar
f8b5f7fad0 Avoid creation of extra array in collection proxy. 2012-09-02 11:35:41 -04:00
Brad Dunbar
75216c068e Fix #1608 - Clarify render example with template definition. 2012-09-01 18:51:11 -04:00
Jeremy Ashkenas
b3b27367f2 Merge pull request #1607 from braddunbar/result
getValue -> _.result
2012-08-31 10:01:53 -07:00
Brad Dunbar
10db0ab258 getValue -> _.result 2012-08-31 12:44:01 -04:00
brad dunbar
f4506ca849 Merge pull request #1603 from braddunbar/test-module
Consolidate test boilerplate; use consistent names.
2012-08-31 08:49:49 -07:00
Brad Dunbar
8ef1730b73 Consolidate test boilerplate; use consistent names. 2012-08-31 11:39:34 -04:00
Brad Dunbar
65ed49bbaa Clean up.
* Remove accidental globals.
* Add missing semicolon.
* Clean up test.
2012-08-31 08:51:09 -04:00
Brad Dunbar
dabc5caf31 Upgrade QUnit. 2012-08-31 08:46:35 -04:00
Brad Dunbar
f49272e19e Fix variable scope error, provide test. 2012-08-29 18:41:08 -04:00
Jeremy Ashkenas
6a22f01bc8 Merge pull request #1599 from braddunbar/sync
Consolidate sync/error events in Backbone.sync.
2012-08-29 13:30:26 -07:00
Brad Dunbar
1f3f45252f Consolidate sync/error events in Backbone.sync. 2012-08-29 16:14:48 -04:00
Brad Dunbar
4335fa885a Merge pull request #1472 from 'contiamo/master'. 2012-08-29 14:57:11 -04:00
Brad Dunbar
d9f1e00f9f No need to default options to {}. 2012-08-29 10:40:53 -04:00
Brad Dunbar
2af9f4d542 Merge pull request #1445 from 'emorikawa/master'. 2012-08-29 10:37:57 -04:00
Jeremy Ashkenas
38991ab5b3 Merge branch 'master' of github.com:documentcloud/backbone 2012-08-28 13:53:14 -04:00
Jeremy Ashkenas
cebc33a661 teense of clarification about urlRoot being a rare override 2012-08-28 13:53:13 -04:00
brad dunbar
355c48011a Merge pull request #1590 from braddunbar/extend
Refactor extend.
2012-08-28 09:37:53 -07:00
Brad Dunbar
f36f11e5e3 Use Surrogate instead of Prototype. 2012-08-28 12:34:23 -04:00
Jeremy Ashkenas
8f271532a1 Merge pull request #1585 from braddunbar/default-history
Fix #1584 - Create default Backbone.history.
2012-08-28 06:50:05 -07:00
Brad Dunbar
62960e787d Refactor extend.
* Use coffeescript style `this.constructor = child`.
* Extend child with parent and static props in one _.extend.
* Use _.has in place of hasOwnProperty.
2012-08-26 19:23:22 -04:00
Brad Dunbar
e70a38ef15 Fix #1584 - Create default Backbone.history. 2012-08-26 10:11:58 -04:00
brad dunbar
9747d235a3 Merge pull request #1459 from braddunbar/attr-spaces
Fix #1455 - Warn that attribute names should not contain spaces.
2012-08-24 06:55:28 -07:00
Brad Dunbar
e23c8714b6 Fix #1455 - Warn that attribute names should not contain spaces. 2012-08-24 09:54:33 -04:00
brad dunbar
ec06125031 Merge pull request #1579 from ngauthier/master
Add check for jsl in `Rakefile`
2012-08-24 06:49:06 -07:00
Nick Gauthier
e5a29107b2 add check for jsl 2012-08-24 13:53:13 +01:00
Jeremy Ashkenas
ab98b91ad9 Merge pull request #1571 from aeosynth/master
use inherits helper directly
2012-08-21 13:24:58 -07:00
James Campos
4c6f1926a2 use inherits helper directly 2012-08-21 13:09:48 -07:00
brad dunbar
a8cf11e622 Merge pull request #1569 from aeosynth/master
[style] coll -> collection
2012-08-21 07:06:23 -07:00
James Campos
3c67364405 [style] coll -> collection 2012-08-21 07:00:08 -07:00
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