Commit Graph

1207 Commits

Author SHA1 Message Date
Brad Dunbar
4ecc161ecf Tweak tests a bit. 2012-06-15 11:30:49 -04:00
Casey Foster
f24ca5a0ed #1412 - Trigger "sync" event for fetch also 2012-06-15 07:33:38 -07:00
Jeremy Ashkenas
0b15e163ac Merge pull request #1411 from philfreo/master
Fix typo in docs
2012-06-14 14:16:50 -07:00
Phil Freo
a3dbdd57e5 fix typo in docs 2012-06-14 14:15:40 -07:00
Brad Dunbar
30e630a8d2 QUnit 1.8.0 2012-06-14 14:56:28 -04:00
Brad Dunbar
39551232d7 Quote attributes correctly for older browsers. 2012-06-14 14:47:57 -04:00
Jeremy Ashkenas
db6514b637 Merge pull request #1408 from davidmarble/master
Move this.collection assignment up a few lines so it's available in Model.parse
2012-06-14 08:56:23 -07:00
Jeremy Ashkenas
d4d7fb97a5 adding Inkling as an (amazing) example app. 2012-06-13 18:33:24 -04:00
brad dunbar
adc81a1993 Merge pull request #1409 from durden/master
Fix broken reference to underscore js in todos example
2012-06-13 14:06:58 -07:00
Luke Lee
1abfefd16b Fix broken reference to missing underscore.js file in todos example. 2012-06-13 16:04:12 -05:00
David Marble
6a39bfd8f3 Move collection assignment a few lines up so this.collection is available in Model.parse 2012-06-13 14:52:42 -04:00
Jeremy Ashkenas
2cd5818fa2 Merge pull request #1404 from braddunbar/history-tests
Add router tests for #1185, #1206.
2012-06-13 09:20:30 -07:00
Brad Dunbar
e4caafc68b Add router tests for #1185, #1206. 2012-06-12 22:28:29 -04:00
Jeremy Ashkenas
fd178e829f Merge pull request #1400 from braddunbar/mock-location
Use mock location to test Backbone.history.
2012-06-12 10:27:52 -07:00
Brad Dunbar
2e2e9f7e96 Use mock location to test Backbone.history. 2012-06-12 11:57:50 -04:00
Jeremy Ashkenas
c59ec4d58d Merge pull request #1398 from braddunbar/ie-test
Ensure tests run in IE7.
2012-06-12 08:36:21 -07:00
Brad Dunbar
f133f0d5dc Ensure tests run in IE7. 2012-06-12 11:31:34 -04:00
Brad Dunbar
7bcd6ad514 Fix #1391 - Use apply in example to account for variadic usage. 2012-06-08 19:36:51 -04:00
Brad Dunbar
ee062f6de6 Fix assertion count. 2012-06-06 14:46:32 -04:00
brad dunbar
a8553e1774 Merge pull request #1380 from DjebbZ/master
Small typo in comment
2012-06-06 06:48:24 -07:00
DjebbZ
6454074dcd Small typo in comment : missing "`". 2012-06-06 15:35:08 +03:00
brad dunbar
d7e77b1af8 Merge pull request #1327 from TheBits/silent-merge
Merge model with silent flag
2012-06-06 04:36:10 -07:00
Brad Dunbar
85bd0b5132 Revert "Revert "Revert "Fix #1366 - Do not prepend root to history.fragment."""
This reverts commit ba980801ce.
2012-06-04 13:00:43 -04:00
Brad Dunbar
2939a2a412 Revert "Skip pushState tests with 'file:' protocol."
This reverts commit 76eeafcc3a.
2012-06-04 13:00:39 -04:00
Brad Dunbar
76eeafcc3a Skip pushState tests with 'file:' protocol. 2012-06-04 12:49:29 -04:00
Brad Dunbar
ba980801ce Revert "Revert "Fix #1366 - Do not prepend root to history.fragment.""
This reverts commit ceb68d7314.
2012-06-04 12:49:17 -04:00
Jeremy Ashkenas
ceb68d7314 Revert "Fix #1366 - Do not prepend root to history.fragment."
This reverts commit 2b0ad77f3b.
2012-06-04 10:52:22 -04:00
Jeremy Ashkenas
97379d6694 Merge pull request #1372 from braddunbar/fragment
Fix #1366 - Do not prepend root to history.fragment.
2012-06-04 07:48:21 -07:00
brad dunbar
7054ca4a2a Merge pull request #1353 from braddunbar/destroy
Fix #1339 - Add Backbone.View#destroy.
2012-06-03 14:44:08 -07:00
Brad Dunbar
767e751278 Documentation for View#destroy. 2012-06-03 17:32:53 -04:00
Brad Dunbar
7828d6d22d Prefer on/off over bind/unbind. 2012-06-03 15:06:44 -04:00
brad dunbar
465f297aee Merge pull request #1374 from braddunbar/test-refactor
Refactor a test for simplicity.
2012-06-03 11:35:52 -07:00
Brad Dunbar
41f64c7f1a Refactor a test for simplicity. 2012-06-03 13:55:40 -04:00
Sam Breed
626e3f16f7 adding correct number of expected assertions to nested change events model test 2012-06-03 11:38:18 -06:00
brad dunbar
3ad4ee8615 Merge pull request #1373 from wookiehangover/test_expected
adding the `expected` argument to all tests
2012-06-03 10:17:13 -07:00
Sam Breed
f4ebee0406 adding the expected argument to all tests 2012-06-02 18:07:11 -06:00
Brad Dunbar
2b0ad77f3b Fix #1366 - Do not prepend root to history.fragment. 2012-06-02 10:51:11 -04:00
Sam Breed
c924e05bff adding tests for #1355 2012-05-30 11:32:53 -04:00
Félix Horro Pita
6250b6353a Pass options to success function on save, create and destroy. 2012-05-30 13:14:41 +02:00
Félix
b371d56669 Pass fetch options to success function (as error function does).
It will allow to use context (an other options) in callback function on success.
2012-05-29 12:59:04 +03:00
Brad Dunbar
dad7e2757e Fix #1339 - Add Backbone.View#destroy. 2012-05-28 16:53:42 -04:00
brad dunbar
5509e13842 Merge pull request #1349 from nervetattoo/docs-advocate-proper-el-usage
Advocate proper usage of $el over $(this.el) in documentation
2012-05-25 16:42:02 -07:00
Raymond Julin
f222360cd4 Advocate proper usage of $el over $(this.el) in documentation 2012-05-26 00:11:31 +02:00
Brad Dunbar
201373a128 Documentation for #1342. 2012-05-24 15:04:44 -04:00
brad dunbar
b6dc6a224e Merge pull request #1342 from caseywebdev/master
Allow Collection to receive falsy `comparator` to override default
2012-05-24 09:26:40 -07:00
Casey Foster
c016a1c58f Added a few more cases for the test 2012-05-24 09:11:29 -07:00
Casey Foster
4a0acdee50 Simplified falsy comparator test case 2012-05-24 09:02:22 -07:00
Casey Foster
3952cde5d0 Merge pull request #1 from wookiehangover/issue1342
adding tests for falsy comparator
2012-05-24 06:52:26 -07:00
Sam Breed
98e01bbc4a adding test for falsy comparators (#1342) 2012-05-23 23:53:13 -06:00
Jeremy Ashkenas
3c7c8d2f1a Merge branch 'master' of github.com:documentcloud/backbone 2012-05-23 17:14:26 -04:00