Commit Graph

466 Commits

Author SHA1 Message Date
Jeremy Ashkenas
fb8da91e3e merging in #336. 2011-05-26 15:49:16 -04:00
Paul Uithol
dae2527113 Merge branch '0.5.0'
Conflicts:
	backbone.js
2011-05-26 21:42:13 +02:00
Paul Uithol
d7e3d5bf4a Updated to apply on the 0.5.0 branch 2011-05-26 21:34:09 +02:00
Paul Uithol
6b229ff90d Merge remote branch 'remotes/upstream/master' 2011-05-26 21:22:33 +02:00
Jeremy Ashkenas
f7602a3050 Merge branch 'patch-1' of https://github.com/damienholzapfel/backbone into 0.5.0 2011-05-26 15:08:24 -04:00
Jeremy Ashkenas
c66650ab90 Merge branch 'master' of https://github.com/corbanbrook/backbone into 0.5.0 2011-05-26 14:54:18 -04:00
Jeremy Ashkenas
082cb28b29 Merge branch 'master' of https://github.com/reconbot/backbone into 0.5.0 2011-05-26 14:52:41 -04:00
Jeremy Ashkenas
5f7b01d94c document collection.reset() with no args. 2011-05-26 14:30:37 -04:00
Jeremy Ashkenas
d8d94f1391 add a warning about pass by reference. Issue #356 2011-05-26 14:25:56 -04:00
Jeremy Ashkenas
2f04473657 fixing refresh -> reset documentation. 2011-05-26 14:13:31 -04:00
Jeremy Ashkenas
78212c2b91 Issue #359 -- removing duplicate model.escape documentation. 2011-05-26 14:05:27 -04:00
Jeremy Ashkenas
9503627e08 documenting that fetch options can also be jquery options. 2011-05-26 14:00:45 -04:00
Jeremy Ashkenas
2b1eae4d9c Issue #365. delete options.comparator. 2011-05-26 13:54:22 -04:00
Jeremy Ashkenas
9a1deb61c7 mention that Backbone require's jQuery > 1.4.2, if using jQuery. Issue #367. 2011-05-26 13:41:41 -04:00
Jeremy Ashkenas
46fbd4cd7f Controller -> Router in the docs, and adding docco for setLocation(). 2011-05-26 13:38:30 -04:00
Jeremy Ashkenas
e56346c7ae normalizing for the Safari window.location bug. 2011-05-26 13:30:29 -04:00
Jeremy Ashkenas
f742bbe947 fixing IE support for 0.5.0 2011-05-26 13:25:06 -04:00
Jeremy Ashkenas
e9b38de419 Backbone.Router formatting, tweaks. 2011-05-26 12:56:08 -04:00
Jeremy Ashkenas
e5ee5503fd Adding Backbone.Router.setLocation, alongside saveLocation, to both save and route at once. 2011-05-26 12:02:12 -04:00
Jeremy Ashkenas
636e7b00a9 remove an extraneous this.options 2011-05-26 11:54:35 -04:00
Jeremy Ashkenas
300c7f0e9c fix the zepto test suite. 2011-05-26 11:04:56 -04:00
Jeremy Ashkenas
cf3215139a initial draft of a 0.5.0 branch 2011-05-26 10:54:28 -04:00
Jeremy Ashkenas
e8476afef0 Issue #366, support for namespaced events. 2011-05-24 13:07:11 -04:00
Jeremy Ashkenas
489ebb7040 Issue #228 ... IE7 hash should look correct after initial load. 2011-05-23 10:28:42 -04:00
Jeremy Ashkenas
a2518103de Merge branch 'master' of github.com:documentcloud/backbone 2011-05-23 09:50:38 -04:00
Jeremy Ashkenas
a5d01f91fe fixing tests for IE / Webkit ... regex, not string match. 2011-05-23 09:50:26 -04:00
Francis
82c288c91e Following recommendations from the OWASP
https://www.owasp.org/index.php/XSS_(Cross_Site_Scripting)_Prevention_Cheat_Sheet

Should be tested with
http://ha.ckers.org/xss.html

Make sure your pages are utf8!
2011-05-07 22:47:35 -07:00
Corban Brook
9d5308b1ab Pass options to the coll.add call in Collection::create so that it can work silently. 2011-05-05 15:15:16 -04:00
Jeremy Ashkenas
82e0b34ada Merge pull request #267 from jasondavies/master.
Don't set content type header for GET requests
2011-05-01 06:48:17 -07:00
Jeremy Ashkenas
d8edb5d025 Merge branch 'gh-pages' 2011-04-28 11:11:28 -04:00
Jeremy Ashkenas
bbf28b82a2 expanding the FAQ for MVC with a direct Rails comparison. 2011-04-28 11:11:17 -04:00
Jeremy Ashkenas
7489bf0395 Merge branch 'gh-pages' 2011-04-28 09:43:30 -04:00
Jeremy Ashkenas
bbce120bf0 Adding the bittorrent example app. 2011-04-28 09:43:05 -04:00
Jeremy Ashkenas
db68321ebb resolving merge 2011-04-27 21:19:02 -04:00
Jeremy Ashkenas
c9bf20e4f3 Adding CloudApp to the list of examples. 2011-04-27 21:13:37 -04:00
Damien Holzapfel
7afd43c0ef Reference calls variable in list variable definition in Backbone.Events.bind 2011-04-27 10:38:13 -07:00
Paul Uithol
965c2992fa Factor out model preparation to a separate function in Backbone.Collection, so 'create' and 'add' behave the same. 2011-04-26 10:36:28 +02:00
Paul Uithol
9b40c7aade Merge branch 'master' of git://github.com/documentcloud/backbone 2011-04-26 10:00:06 +02:00
Jeremy Ashkenas
58708b3cec clarifying wording 2011-04-25 15:55:40 -04:00
Samuel Clay
089aeb8385 Adding a note about using Collection.create on a model that has been saved server-side. 2011-04-25 15:51:59 -04:00
Samuel Clay
a00b798318 Adding in a note about Backbone.history.start() returning a boolean for whether or not a match has been found in the current URL fragment. Thanks to XiXora for the recommendation. 2011-04-25 13:07:35 -04:00
Samuel Clay
f44cfeeb36 Adding in a note about passing in an object literal or a model to Collection.create. Thanks to MattJ for the recommendation. 2011-04-25 13:01:03 -04:00
Samuel Clay
ee215be027 Adding test for hashbang URLs. For pull request #312. 2011-04-22 12:16:17 -04:00
Samuel Clay
0cc8cb0890 Merge https://github.com/ptn/backbone 2011-04-22 11:52:38 -04:00
Samuel Clay
577758af89 Adding XHR object to Collection.create (which comes from Model.save). 2011-04-22 11:41:30 -04:00
Samuel Clay
399e7453f3 _ to status in Model.parse. No need to clobber Underscore.js just to ignore a parameter. 2011-04-22 11:32:57 -04:00
Samuel Clay
4881621a72 Adding XHR object to Model.parse and Collection.parse method signatures. jQuery and Zepto use the same callback signature: response, status, xhr. 2011-04-22 11:25:50 -04:00
Samuel Clay
1d4484d1e4 Removing Ender.js support for the time being, as it needs to fix its AJAX methods to corrospond with jQuery/Zepto success/error signatures. 2011-04-22 11:06:50 -04:00
Pablo A. Torres Navarrete
0f118ecb6e Add a failing test for Collection.create not running callbacks 2011-04-21 12:07:11 -05:00
Pablo A. Torres Navarrete
1598801f23 Pass the error and success callbacks when creating the model to add to a Collection 2011-04-21 11:29:55 -05:00