Commit Graph

977 Commits

Author SHA1 Message Date
Jeremy Ashkenas
dca02ecab7 Fixes #1053 -- updating comment to reflect changed style of validate() 2012-02-27 14:56:21 -05:00
Jeremy Ashkenas
5ef4921c54 merging async test. 2012-02-27 14:37:50 -05:00
Jeremy Ashkenas
f930b5f042 adding additional router test 2012-02-27 14:37:13 -05:00
Jeremy Ashkenas
83d2918bc7 removing a test that is invalid in IE. 2012-02-27 14:32:30 -05:00
Jeremy Ashkenas
54e284bced Merge branch 'master' of github.com:documentcloud/backbone 2012-02-27 14:30:26 -05:00
Jeremy Ashkenas
07604deac0 merging in hash fixer for FF 2012-02-27 14:30:23 -05:00
Brad Dunbar
f8b37a84b5 Add test for #1048. 2012-02-27 14:23:49 -05:00
Brad Dunbar
111d5a1f19 Add a test for #1052. 2012-02-27 14:16:00 -05:00
Jeremy Ashkenas
b37a09662e Merge pull request #1048 from marat-dreizin/master
Added ability to avoid an additional '$()' call in 'setElement' method if current 'element' is already wrapped with '$()'
2012-02-27 11:14:50 -08:00
Jeremy Ashkenas
c9599d6ba0 fixing or= JS style for sync options. 2012-02-27 14:04:44 -05:00
Jeremy Ashkenas
a91b325c99 Merge pull request #1052 from Sid3Show/master
Fix to make Backbone.sync options parameter optional again
2012-02-27 11:03:49 -08:00
Oli
daea564e8a Made Backbone.sync options parameter optional 2012-02-27 18:04:59 +00:00
Jeremy Ashkenas
41e9d1a847 Merge pull request #1040 from braddunbar/$-docs
Fixes #1038 - Document changes to `view.$`.
2012-02-25 06:37:38 -08:00
Marat Dreizin
0d1d278c7b Added ability to avoid an additional '$()' call in 'setElement' method if current 'element' is already wrapped with '$()' 2012-02-25 02:05:12 +03:00
Brad Dunbar
ef5835ac5a Fixes #1038 - Document changes to view.$. 2012-02-22 18:35:07 -05:00
Jeremy Ashkenas
a960794534 Merge pull request #1024 from braddunbar/locals
Use local references to `Model`, `View`, etc.
2012-02-18 21:54:12 -08:00
Brad Dunbar
e3098484ce Use local references to Model, View, etc. 2012-02-18 12:35:50 -05:00
Jeremy Ashkenas
4de073ca14 Merge pull request #1023 from braddunbar/events
Clean up `Backbone.Events`.
2012-02-18 07:29:26 -08:00
Brad Dunbar
f92fa9a0bd Clean up Backbone.Events.
* Refactor `Backbone.Events` for increased clarity.
* Update documentation to include multiple events.
* Use `event` consistently throughout.
2012-02-18 09:19:26 -05:00
Brad Dunbar
c8cbde2e73 Correct more grammar. 2012-02-17 10:28:51 -05:00
brad dunbar
6560ad836b Merge pull request #1022 from hswolff/grammar-fixes
fix instances of it's to its for proper grammar
2012-02-17 06:33:17 -08:00
Harry Wolff
a4410ede47 fix instances of it's to its for proper grammar 2012-02-17 09:29:12 -05:00
Jeremy Ashkenas
c6b28149fa Merge pull request #982 from braddunbar/change
Fixes #959 - Silent changes fire `'change:attr'`.
2012-02-17 05:06:52 -08:00
Brad Dunbar
5f129678eb documentation for changed 2012-02-17 07:22:57 -05:00
Brad Dunbar
afbca7229c Fixes #1016 - Expose changed.
* Expose `changed` as a public hash of changes.
* Initialize `changed`, `_pending`, and `_silent`
  in the constructor instead of checking in `set`.
* Ensure `changed` matches `attributes`.
2012-02-17 07:22:43 -05:00
Brad Dunbar
82ee97d36b Use null for uninitialized variables. 2012-02-17 07:22:43 -05:00
Brad Dunbar
69b80f5e3a Fixes #959 - Silent changes fire 'change:attr'.
* Silent changes are tracked so `'change:attr'` can be
  fired next time `change` is called.
* Pending changes are tracked to prevent infinite loops
  and accurately reflect nested changes.
2012-02-17 07:22:43 -05:00
Jeremy Ashkenas
9587a1f292 Merge pull request #1014 from OttoAllmendinger/master
fix error message on missing event callback
2012-02-16 08:55:56 -08:00
Otto Allmendinger
5071967e32 fix error message on missing event callback 2012-02-16 11:48:58 +01:00
Jeremy Ashkenas
e5db1c93d0 Merge pull request #1011 from wookiehangover/issue996
adding test coverage for route precedence as per issue #996
2012-02-15 09:04:30 -08:00
Jeremy Ashkenas
16b37e7349 Merge pull request #1010 from braddunbar/history-start
fixes #1003 - History is started before `navigate`
2012-02-15 07:09:59 -08:00
brad dunbar
cf93180a55 Merge pull request #1004 from peterp/patch-2
Proposed clarification in documentation:
2012-02-15 05:11:41 -08:00
Sam Breed
8d8a3599a9 adding test coverage for route precedence as per issue #996 2012-02-14 23:18:46 -07:00
Brad Dunbar
232c888038 fixes #1003 - History is started before navigate 2012-02-15 00:39:38 -05:00
Peter Pistorius
c4d53abd06 fixes #1004 2012-02-14 22:58:45 +02:00
Peter Pistorius
742dde3469 Changed:
`Accounts.reset(<%= ... %>)` to `accounts.reset(<%= ... %>)`
`Projects.reset(<%= ... %>)` to `projects.reset(<%= ... %>)`

As it's popular in JavaScript to capitalize constructors it might be confusing in this context.
2012-02-14 22:57:22 +02:00
Jeremy Ashkenas
04e2e20299 Merge pull request #1008 from braddunbar/missing-callback
`on` is a noop if no callback is provided
2012-02-14 12:29:38 -08:00
Brad Dunbar
8b285c6c83 on is a noop if no callback is provided 2012-02-14 15:22:27 -05:00
Jeremy Ashkenas
b9e36f0f15 Merge pull request #1006 from bmaland/docs
Fix signature of urlRoot in documentation
2012-02-14 11:20:00 -08:00
Bjørn Arild Mæland
c2a0895787 Fix signature of urlRoot in documentation 2012-02-14 18:45:47 +01:00
brad dunbar
1406ef1c28 Merge pull request #1001 from vertigem/feature/qunit-toolbar
added qunit toolbar
2012-02-14 05:44:24 -08:00
Duke
63188db42b added qunit toolbar 2012-02-13 22:12:15 -02:00
Jeremy Ashkenas
a603e5a843 resolving merge with master. 2012-02-13 14:41:46 -05:00
Jeremy Ashkenas
18fba57724 Much asked-for change. Instead of throwing an early error when adding duplicate models, Backbone will simply skip them instead. 2012-02-13 14:39:36 -05:00
Jeremy Ashkenas
af4fdb3dc9 Merge pull request #994 from OttoAllmendinger/master
cosmetic fix for index.html
2012-02-13 08:37:28 -08:00
Otto Allmendinger
e0b2449610 unify dashes in index.html
use en-dash (U+2013) instead of hyphen-minus (U+002D) in index.html
navigation
2012-02-13 17:29:47 +01:00
Ted Han
3d9d8348ee Adding sidebar items for github repo and annotated source, as well as a reference to Backbone's license file to documentation. 2012-02-11 11:40:27 -06:00
brad dunbar
178ae27a9f Merge pull request #985 from peterp/patch-1
`sort` and `sortBy` are incorrectly swopped in collection.comparator docs
2012-02-10 05:23:51 -08:00
Peter Pistorius
417bcb9720 Fixes #984 2012-02-10 15:12:17 +02:00
brad dunbar
b3aed20119 Merge pull request #980 from vovik/new-master
fixes #972 by cleaning up a messy conditional
2012-02-09 05:57:02 -08:00