github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-01-23 22:08:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,405 Commits 4 Branches 35 Tags
c2261bf962dae017fb31bf783ca609d88f6b2b4e
Commit Graph

1405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dave Tonge
c2261bf962 Modified two tests to listen for error events rather than catching exceptions when adding an invalid model to a collection 2012-10-08 05:26:55 +01:00
Dave Tonge
89009ca51c Collection.add triggers an error rather than throwing an error when an invalid model is added. 2012-10-08 05:25:29 +01:00
Jeremy Ashkenas
bc4c7a339d Merge pull request #1714 from RStankov/view-dispose-can-work-with-normal-objects 
Check if model/collection support .off when disposing of the view
 2012-10-05 12:12:39 -07:00
Radoslav Stankov
4a20d66f66 Check if model/collection support .off when disposing of the view 2012-10-05 22:04:12 +03:00
Jeremy Ashkenas
f0586cfa5f period in comment 2012-10-03 15:18:46 -04:00
Jeremy Ashkenas
bdefd3cce1 Merge branch 'change-bug' of https://github.com/tgriesser/backbone 2012-10-03 15:11:01 -04:00
Jeremy Ashkenas
205307a856 Fixes #1697 -- media query for firefox for embedding inside firebug for documentation. 2012-10-03 15:00:11 -04:00
Jeremy Ashkenas
2b1e9b48bf Merge branch 'master' of github.com:documentcloud/backbone 2012-10-03 14:48:09 -04:00
Jeremy Ashkenas
e120642cb7 Fixes #1701 -- improves documentation for model.off() 2012-10-03 14:47:35 -04:00
Jeremy Ashkenas
612496bb8c Merge pull request #1509 from ianstormtaylor/optional-params 
added optional groups to route syntax, with tests
 2012-10-02 19:43:42 -07:00
Ian Storm Taylor
3169cfe6ed swapped optional route syntax to parentheses, and adding docs 2012-10-02 19:10:59 -07:00
Ian Storm Taylor
ac8a807f49 added optional groups to route syntax, with tests 2012-10-02 19:10:59 -07:00
Jeremy Ashkenas
1f67712b1a Adding Hulu.com as an example 2012-10-02 12:01:59 -04:00
Jeremy Ashkenas
95e1eb5ad7 revising Inkling description, as requested 2012-10-02 10:55:15 -04:00
Jeremy Ashkenas
64e2d0a6ea Merge pull request #1696 from braddunbar/pushstate-transition 
Fix #1695 - Ignore location.search during pushState transition.
 2012-10-02 05:01:51 -07:00
Brad Dunbar
3f530c2ab5 Fix #1695 - Ignore location.search during pushState transition. 2012-10-02 06:36:23 -04:00
Jeremy Ashkenas
84039f3924 Merge pull request #1693 from braddunbar/el-function 
Allow view.el to be provided as a function.
 2012-10-01 20:18:57 -07:00
Jeremy Ashkenas
06c764c5e8 merge conflict resolved 2012-10-01 17:06:27 -04:00
Jeremy Ashkenas
804bb551cb Merge branch 'master' of github.com:documentcloud/backbone 2012-10-01 16:21:11 -04:00
Jeremy Ashkenas
2eabf0450c fixing unescaped regex 2012-10-01 16:20:58 -04:00
Brad Dunbar
e2d5483616 Allow view.el to be provided as a function. 2012-10-01 15:39:02 -04:00
Tim Griesser
2e4f48e450 whitespace cleanup after rebase 2012-10-01 15:22:20 -04:00
Tim Griesser
71b6404d73 refactor change/set, fixing #1478 and #1664 2012-10-01 15:16:55 -04:00
Jeremy Ashkenas
cb988aade3 Merge pull request #1692 from braddunbar/extend 
Fix #1684 - Correct regression in refactoring extend.
 2012-10-01 10:22:10 -07:00
Brad Dunbar
2b646c6bff Fix #1684 - Correct regression in refactoring extend. 2012-10-01 13:16:47 -04:00
Sam Breed
aa36a35524 Merge pull request #1691 from wookiehangover/issue_1545 
consistently handle `undefined` being passed to the model constr (#1545)
 2012-10-01 09:08:02 -07:00
Sam Breed
b347f9f8d4 consistently handle undefined being passed to the model constr (#1545) 2012-10-01 10:06:00 -06:00
Jeremy Ashkenas
5720e54355 Fixes #1589 -- make the Backbonejs.org docs go responsive. 2012-09-28 15:32:46 -04:00
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 fcd3898e24.

As described in cowboy/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