Commit Graph

1495 Commits

Author SHA1 Message Date
Jeremy Ashkenas
fbbb2e675e Fixes #1843 -- reworks parsing behavior. It now always applies if you define it, and no longer passes xhr. (parsing should be a pure function of the data) 2012-11-28 14:26:49 -05:00
Jeremy Ashkenas
3de9f3504e Revert "tiny tweak"
This reverts commit e7d85efa9c.
2012-11-28 14:14:21 -05:00
Jeremy Ashkenas
e7d85efa9c tiny tweak 2012-11-28 14:00:06 -05:00
Jeremy Ashkenas
182804b448 Merge pull request #1846 from akre54/extendable-options
Allow View.options to be provided as a function
2012-11-28 10:59:39 -08:00
Jeremy Ashkenas
4ac21c0a23 Merge branch 'master' of github.com:documentcloud/backbone 2012-11-28 13:53:59 -05:00
Jeremy Ashkenas
46f2823107 Fixes #1849 -- adding a .npmignore 2012-11-28 13:53:57 -05:00
Adam Krebs
bc87c3fa46 add options function test 2012-11-27 11:22:19 -05:00
Adam Krebs
b34f4f38c7 use _.result for this.options 2012-11-27 10:44:01 -05:00
Jeremy Ashkenas
5ebd1fdb15 Merge pull request #1838 from asgeo1/add_options_for_tojson
Pass options through to toJSON
2012-11-26 07:15:32 -08:00
Adam George
be209e623d Pass options through to toJSON
This is useful if you have overriden toJSON with own implemention and
need to pass some options through
2012-11-21 14:34:15 +11:00
brad dunbar
900c4fec97 Merge pull request #1837 from j0nx/master
Minor clean up
2012-11-20 12:51:23 -08:00
Al Urim
70ff93bdfc Update backbone.js
Remove unnecessary argument.
2012-11-20 12:47:53 -08:00
Jeremy Ashkenas
7b51c224bc Merge pull request #1836 from Ore4444/patch-1
Removed a redundant sentence.
2012-11-20 06:02:11 -08:00
Ore Landau
8898fbfdc5 Removed a redundant sentence. 2012-11-20 14:57:54 +02:00
Jeremy Ashkenas
ef8bb66839 Asserting that cloning a model and passing it in as attributes doesn't share object identity. 2012-11-19 17:00:47 -05:00
Jeremy Ashkenas
6f95a9b6f5 Fixes #1750 -- better document View#options 2012-11-19 16:47:38 -05:00
Jeremy Ashkenas
0b27091e5a fixes previous commit 2012-11-19 15:30:51 -05:00
Jeremy Ashkenas
c746c3c5c2 Fixes #1806, model.save(null, {wait: true}) with validation 2012-11-19 15:29:41 -05:00
Jeremy Ashkenas
dd59ae6185 Merge pull request #1826 from tgriesser/events-options
Allowing events to be passed in view's options
2012-11-19 12:06:26 -08:00
Jeremy Ashkenas
e1a29bd5ff Fixes #1832 -- stretched images on retina mobile 2012-11-19 15:00:41 -05:00
Jeremy Ashkenas
bec41307d3 rewording hashChange: false docs 2012-11-16 16:59:44 -05:00
Jeremy Ashkenas
626f3d7f0e Merge pull request #1803 from braddunbar/hashchange-false
Fix #1801 - Add documentation for disabling hash based routing.
2012-11-16 13:58:09 -08:00
Jeremy Ashkenas
bf82159ad7 capitalization typo 2012-11-16 15:41:17 -05:00
Jeremy Ashkenas
09ba834f3d Adding newsblur as an example app 2012-11-16 15:35:06 -05:00
Jeremy Ashkenas
549bc3209b tiny edits 2012-11-16 15:08:02 -05:00
Jeremy Ashkenas
693d58d9e4 typo 2012-11-16 15:03:17 -05:00
Jeremy Ashkenas
9edadc2c2b Perhaps the most frequently asked question ... Why Backbone, not X? 2012-11-16 14:50:49 -05:00
Tim Griesser
a96fe08f92 allowing events to be passed in view's options 2012-11-16 14:21:59 -05:00
Jeremy Ashkenas
6fd32ea7b7 Fixes #1825 -- document that multiple adds of the same model is a no-op. 2012-11-16 12:14:49 -05:00
Brad Dunbar
39ff3870a7 Fix gh-1820 - Update comment, use global flag. 2012-11-14 17:00:17 -05:00
Jeremy Ashkenas
30f3273aec s/https/http 2012-11-12 10:15:55 -05:00
Jeremy Ashkenas
ca250f67f6 index.html 2012-11-07 17:39:13 -05:00
Jeremy Ashkenas
489b1d4205 Adding Syllabus as an example app 2012-11-07 17:07:57 -05:00
Brad Dunbar
783ecf70db Fix #1801 - Add documentation for disabling hash based routing. 2012-11-06 07:23:01 -05:00
Brad Dunbar
35054dada6 A bit more documentation on success and error callbacks. 2012-11-05 09:30:01 -05:00
Casey Foster
29cb71ce37 Fix #1798 correct Model#fetch documentation
Conflicts:
	index.html
2012-11-05 09:04:49 -05:00
Jeremy Ashkenas
85d58a1f72 Merge pull request #1371 from braddunbar/emulate-options
Sync accepts options for emulateHTTP, emulateJSON.  Uses globals as defaults.
2012-11-02 14:31:09 -07:00
Brad Dunbar
b75c4c52ee Merge branch 'master' into emulate-options
Conflicts:
	backbone.js
	test/sync.js
2012-11-02 17:05:29 -04:00
Jeremy Ashkenas
91ce6c3e0c Merge pull request #1795 from braddunbar/trailing-space
Strip trailing space in fragments.
2012-11-02 09:00:15 -07:00
Brad Dunbar
d196c25fe6 Strip trailing space from fragments. 2012-11-02 09:03:16 -04:00
Brian Erickson
d389418eb1 Updated issue number in test to match pull request issue. 2012-11-01 22:56:15 -06:00
Brian Erickson
8decce8d7d Issue #1793: Backbone.history.navigate should use this.getFragment instead of fragment to avoid routes getting triggered twice 2012-11-01 22:41:47 -06:00
Sam Breed
aeaf2ee9cf Merge pull request #1792 from caseywebdev/reorder-constructor
Fix #1791 reorder constructor so `attributes` is defined for `parse`
2012-11-01 17:47:02 -07:00
Casey Foster
7909341139 Add test for #1791 2012-11-01 17:09:05 -07:00
Casey Foster
34ce37137e Fix #1791 reorder constructor so attributes is defined for parse 2012-11-01 17:02:37 -07:00
brad dunbar
34cb42d435 Merge pull request #1787 from wookiehangover/issue1785
updating documentation for Collection#reset method signature (fixes #1785)
2012-10-30 19:14:29 -07:00
Sam Breed
c162894784 updating documentation for Collection#reset method signature, fixes #1785 2012-10-30 19:47:41 -06:00
Jeremy Ashkenas
1eb7964a45 Merge pull request #1786 from gsamokovarov/bump-underscore-in-package-json
Bump underscore version to 1.3.3 in package.json
2012-10-30 15:43:58 -07:00
Genadi Samokovarov
086b2dd9df Bump underscore version to 1.3.3 in package.json 2012-10-31 00:20:15 +02:00
Jeremy Ashkenas
1350c84171 Merge pull request #1784 from caseywebdev/package-json-keywords
Update package.json with more relevant keywords
2012-10-30 13:39:48 -07:00