Jeremy Ashkenas
d02415fb4b
Merge branch 'master' of github.com:documentcloud/backbone
2012-09-28 15:21:19 -04:00
Jeremy Ashkenas
d6046cfb5e
fixing z-index
2012-09-28 15:21:13 -04:00
Jeremy Ashkenas
57e1e7d083
Merge pull request #1612 from joshvermaire/chain_navigation
...
allow for chaining of router navigation
2012-09-28 12:15:04 -07:00
Jeremy Ashkenas
9ba384627c
Merge pull request #1667 from braddunbar/add
...
Fix #1604 - Refactor add, remove index option.
2012-09-26 11:53:45 -07:00
Jeremy Ashkenas
3d0d8f0570
Merge pull request #1674 from braddunbar/url-root
...
Remove dead code.
2012-09-26 09:01:08 -07:00
Brad Dunbar
e7e689a280
Fix #1677 - Escape title attribute.
2012-09-25 12:22:38 -04:00
Brad Dunbar
a45ab0095f
Remove dead code.
...
Since the root will always contain a leading slash and
the fragment will never contain a leading slash, the
fragment will never start with the root.
2012-09-24 14:37:18 -04:00
brad dunbar
c0cdd7e0e5
Merge pull request #1669 from liquid/docs_fixes
...
Fix namespace reference in the todos example app docs.
2012-09-23 12:28:21 -07:00
Attila Györffy
9fd48f1d00
Fix namespace reference in the todos example app docs.
2012-09-23 21:25:38 +02:00
Casey Foster
1e87356815
Added test for sorting during collection#add
2012-09-22 16:14:11 -07:00
Brad Dunbar
b785a593eb
Remove shadowed clear function from todo models.
2012-09-22 11:35:03 -04:00
Brad Dunbar
6d0a7fd45b
Merge pull request #1596 from fancyoung/patch-1.
2012-09-22 11:28:36 -04:00
Brad Dunbar
142d2ac832
Fix #1604 - Refactor add, remove index option.
...
* Avoid temporary constructs by splicing duplicates during traversal.
* Remove `index` option.
* Avoid creating empty options.
2012-09-22 08:59:37 -04:00
Jeremy Ashkenas
7bfce6fe53
Merge pull request #1658 from braddunbar/history-window
...
Fix #1653 - Ensure that `History` can be used outside of the browser.
2012-09-17 11:46:59 -07:00
Brad Dunbar
a424341355
Fix #1653 - Ensure that History can be used outside of the browser.
...
* Dispense with options argument.
* Use `window` to retrieve location/history by default.
* Don't throw outside of the browser, allowing location and
history to be replaced appropriately.
2012-09-17 14:38:48 -04:00
Jeremy Ashkenas
da18e00211
Merge branch 'master' of github.com:documentcloud/backbone
2012-09-17 13:11:20 -04:00
Jeremy Ashkenas
74ba05c8da
adding CONTRIBUTING to backbone
2012-09-17 13:10:58 -04:00
Jeremy Ashkenas
161c3a21d7
Merge pull request #1656 from braddunbar/sortby-groupby
...
Fix #1655 - sortBy & groupBy use attributes.
2012-09-17 08:35:18 -07:00
Brad Dunbar
c344201f6e
Fix #1655 - sortBy & groupBy use attributes.
2012-09-17 11:31:46 -04:00
Jeremy Ashkenas
ff0ddbcee2
Merge pull request #1650 from braddunbar/#
...
Fix #1649 - Set location.hash with a leading #.
2012-09-17 08:26:34 -07:00
Brad Dunbar
07b88efadd
Revert "TravisCI integration."
...
This reverts commit fcd3898e24cowboy/grunt#219 , grunt's phantomjs bootstrap often causes a
timeout (in v0.3.x). This is fixed in the development branch of grunt so we
can revisit travis integration after the next release.
2012-09-17 10:47:15 -04:00
Jeremy Ashkenas
8ea7d9a01d
Merge pull request #1644 from braddunbar/default-options
...
Refactor reset/sort.
2012-09-14 10:49:57 -07:00
Jeremy Ashkenas
5b19d8acce
tweaking edge link
2012-09-14 13:11:08 -04:00
Jeremy Ashkenas
5eb4c7ba0d
Merge branch 'master' of github.com:documentcloud/backbone
2012-09-14 13:08:16 -04:00
Jeremy Ashkenas
e736811fd1
Adding an Edge Version link
2012-09-14 13:07:56 -04:00
Brad Dunbar
07b6760a87
Style - Split long line into two.
2012-09-14 11:02:30 -04:00
Brad Dunbar
7c993bd3fd
Fix #1649 - Set location.hash with a leading #.
2012-09-14 10:56:50 -04:00
Brad Dunbar
85fca58bb9
Refactor reset/sort.
...
* Avoid creating unnecessary objects/arrays.
* Add test for sort-style comparator context.
2012-09-14 08:13:33 -04:00
Brad Dunbar
36a733a8bc
Tweak string comparator implementation.
2012-09-14 08:05:41 -04:00
Brad Dunbar
8fdcaf207a
Merge pull request #1587 from krawaller/master.
...
Conflicts:
test/collection.js
2012-09-14 07:19:57 -04:00
KungD
8f29954011
removed prefix logic
2012-09-14 07:22:22 +02:00
KungD
4707b02056
removed automatic sorting in anticipation of sort option to .set
2012-09-12 18:27:10 +02:00
KungD
d2b4c1e55e
test update
2012-09-12 07:06:54 +02:00
KungD
72c460753f
updated docs to reflect automatic resorting
2012-09-12 06:51:20 +02:00
KungD
342a525e12
automatic resort when sorting attribute changes
2012-09-12 06:43:55 +02:00
KungD
43491f6f28
minor performance refactor
2012-09-12 06:09:48 +02:00
Jeremy Ashkenas
dc960f7933
Merge pull request #1637 from braddunbar/travis
...
TravisCI integration.
2012-09-10 09:03:34 -07:00
Brad Dunbar
fcd3898e24
TravisCI integration.
2012-09-10 09:29:24 -04:00
Brad Dunbar
3b08fb8c89
Remove dependencies on qunit html.
2012-09-07 08:00:04 -04:00
Brad Dunbar
68e4377d15
Merge pull request #1629 from gsamokovarov/view-test-refactoring.
2012-09-07 07:28:44 -04:00
Jeremy Ashkenas
e809bfbfbd
Merge pull request #1628 from braddunbar/frag
...
Remove unnecessary `frag` variable.
2012-09-06 07:40:54 -07:00
Genadi Samokovarov
e413f63a4b
Refactor test/view.js
2012-09-06 15:06:17 +03:00
Brad Dunbar
c19459a816
Remove unnecessary frag variable.
2012-09-05 16:06:05 -04:00
Jeremy Ashkenas
3fd842c6d3
Merge pull request #1626 from braddunbar/test-prefix
...
Drop doubled test prefixes.
2012-09-05 06:27:47 -07:00
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
