Jeremy Ashkenas
bc931c31e4
Fixing Routing.
2012-06-18 10:14:46 -04:00
Jeremy Ashkenas
2eeaa4a716
merged
2012-06-18 09:50:12 -04:00
Jeremy Ashkenas
76de397c64
Merge pull request #1414 from braddunbar/root-trailing-slash
...
Fix #1387 - getFragment trims trailing slash before removing root.
2012-06-18 06:49:15 -07:00
Brad Dunbar
966bb3dbdb
Update event args for "destroy" and "sync".
2012-06-18 09:14:57 -04:00
brad dunbar
af31b4eb29
Merge pull request #1422 from rhencke/patch-1
...
Note options parameter for add/remove/reset in Catalog of Events.
2012-06-18 06:10:07 -07:00
Robert Hencke
faeca244a2
Note options parameter for add/remove/reset in Catalog of Events.
2012-06-18 07:57:36 -05:00
Brad Dunbar
be5d4fd769
Fix #1366 - Root should not be prepended to history.fragment.
2012-06-16 12:45:08 -04:00
Brad Dunbar
9f9028bfab
Add documentation for Model#sync, Collection#sync.
2012-06-16 11:53:21 -04:00
Brad Dunbar
b6b9ec72ff
Fix #1365 - Destroy: new models execute success callback.
2012-06-16 11:33:05 -04:00
Brad Dunbar
54ec530eea
Provide a default implementation of sync.
2012-06-16 10:55:03 -04:00
Brad Dunbar
4286e0c5ec
Fix #1403 - Trigger "sync" unconditionally.
2012-06-16 10:45:01 -04:00
Jeremy Ashkenas
2b5af42bfb
Merge branch 'master' of github.com:documentcloud/backbone
2012-06-15 13:11:37 -04:00
Jeremy Ashkenas
45afea1160
adding Easel.io as an example site.
2012-06-15 13:11:03 -04:00
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
Brad Dunbar
27e9e4743c
Fix #1387 - getFragment trims trailing slash before removing root.
...
* The root should not be stripped when dealing with hashes.
* The trailing slash can be removed since the fragment is
stripped anyway. This could probably be done only once
in `start`, but is saved for a later patch.
* The mock pathname needs to prepend a slash in IE since
anchor.pathname does not contain it.
2012-06-15 00:05:03 -04: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
