Casey Foster
fd0cb9695d
Fix bug causing mutations while merging with nested models
...
Again, I'm not a huge fan of this solution to the merge + defaults problem, but
this will work until somone more clever than I figures out what to do or we
reevaluate the whole existance checking ordeal.
2013-05-01 13:38:33 -05:00
Ted Han
6b3e52cd9d
Fixing licensing typo.
2013-04-26 10:08:32 -05:00
Ted Han
921799c310
Updating license to reflect DocumentCloud's correct attribution.
2013-04-26 00:37:25 -05:00
Brad Dunbar
dc5de0190e
Revert non-model sync commits.
...
Revert "Allow non-model object as second argument, with test."
This reverts commit 32743e6b606d72e1be352caf748651
2013-04-22 11:22:23 -04:00
Tim Griesser
32743e6b60
Allow non-model object as second argument, with test.
2013-04-21 21:02:37 -04:00
Rune Skjoldborg Madsen
6d72e1be35
trigger request event only if model extends Backbone.Events, and fix whitespace
2013-04-21 20:23:26 -04:00
Rune Skjoldborg Madsen
2caf748651
add if statement and add passing test
2013-04-21 20:23:25 -04:00
Jeremy Ashkenas
c3a1af0839
Merge pull request #2477 from caseywebdev/merge-defaults
...
Fix #2471 merging with defaults
2013-04-18 08:13:28 -07:00
Casey Foster
8141f4fbc2
Fix #2471 merging with defaults
2013-04-12 15:52:08 -05:00
Casey Foster
f61bd29d30
Add failing merge with defaults test
2013-04-12 10:54:53 -05:00
Jeremy Ashkenas
4e72ab1a94
Merge pull request #2461 from braddunbar/view-options
...
Dispense with View#options merging.
2013-04-09 09:19:30 -07:00
Brad Dunbar
51eed189bf
Dispense with View#options merging.
2013-04-09 09:38:23 -04:00
Jeremy Ashkenas
bc82a4d370
Merge pull request #2460 from braddunbar/view-options
...
Fix #2458 - Options are not attached to views.
2013-04-08 19:29:59 -07:00
Brad Dunbar
a22cbc7f36
Fix #2458 - Options are not attached to views.
2013-04-08 13:58:15 -04:00
Jeremy Ashkenas
afb9dfc6d8
Fixes #2431 , #2452 , a little bit lex talionis, but appropriate, I think.
2013-04-04 15:06:25 +08:00
Jeremy Ashkenas
165849e0ba
Merge pull request #2085 from caseywebdev/reorder
...
Fix #2068 - `set` respects input order in absence of comparator
2013-04-03 19:30:28 -07:00
Jeremy Ashkenas
852aaf6fdf
Merge pull request #2455 from williamhc/patch-1
...
return from Backbone.history.navigate whether a route was matched.
2013-04-03 19:19:03 -07:00
Casey Foster
d12e4cf881
set respects input order in absence of comparator
2013-04-03 19:18:59 -05:00
Brad Dunbar
9116ddea6a
Phantomjs 1.9.0-1.
2013-04-03 09:33:20 -04:00
William Humphreys-Cloutier
746aa1d37e
return from Backbone.history.navigate whether a route was matched.
2013-04-01 21:59:09 -04:00
brad dunbar
4b7b0d1e08
Merge pull request #2454 from gsamokovarov/remove-leftover-url-docs
...
Remove leftover attachable url documentation
2013-04-01 13:03:21 -07:00
Genadi Samokovarov
5e683301f4
Remove leftover attachable url documentation
2013-04-01 22:58:18 +03:00
Tim Griesser
624a5076ec
very minor code formatting
2013-03-30 17:06:33 -04:00
Casey Foster
4db2676477
Don't validate twice in
2013-03-29 14:16:00 -05:00
Casey Foster
8e7208e0d8
Fix #2446 save should always set with validate: true by default
2013-03-29 13:46:17 -05:00
Brad Dunbar
0e7ac5a619
Fix #2438 - Indicate shallow copying.
2013-03-29 09:32:33 -04:00
Sam Breed
7adeeafce4
adding missing comma
2013-03-28 21:35:19 -06:00
Jeremy Ashkenas
9c9463ccb3
Merge pull request #2445 from alexmcpherson/master
...
Documentation paragraph for a common misconception about routes with trailing slashes.
2013-03-28 16:01:07 -07:00
Alex McPherson
81585a08fb
Clarification on optional parameters and trailing slashes in routes documentation
2013-03-28 11:44:55 -06:00
Sam Breed
dc2521dc8c
Merge pull request #2435 from theoreticaLee/master
...
Add backbone's license info to package.json
2013-03-26 22:08:09 -07:00
Lee Leathers
9b6ee4166d
Add license to package.json
2013-03-26 21:48:57 -07:00
brad dunbar
68ffa87aaa
Merge pull request #2433 from CSNW/faq-typo
...
Fixed tiny typo in FAQ
2013-03-26 11:54:18 -07:00
Peter Rust
c5a791b932
Fixed tiny typo in FAQ
2013-03-26 11:49:13 -07:00
brad dunbar
61243f58d5
Merge pull request #2429 from zyzniewski/master
...
Fixed documentation anchor for Collection#fetch
2013-03-26 04:13:02 -07:00
Tomasz Żyźniewski
297b1527b2
fixed documentation anchor
2013-03-26 11:41:52 +01:00
Jeremy Ashkenas
dd85833b16
Merge pull request #2426 from gsamokovarov/no-url-no-urlroot
...
Don't accept urlRoot from Model and url from Collection
2013-03-25 18:23:15 -07:00
Genadi Samokovarov
5b8f794272
Remove the redundant documentation bits
2013-03-25 23:12:51 +02:00
Genadi Samokovarov
3bfbcd4123
Don't accept urlRoot from Model and url from Collection
2013-03-25 23:07:46 +02:00
Tim Griesser
820182bcfb
Merge pull request #2423 from braddunbar/model-changed
...
Fix #2422 - Clarify docs about changed attributes.
2013-03-25 09:30:35 -07:00
Brad Dunbar
795b442dae
Fix #2422 - Clarify docs about changed attributes.
2013-03-25 11:42:00 -04:00
brad dunbar
dd49c6a080
Merge pull request #2420 from gsamokovarov/model-no-url-option
...
Don't attach url if passed as an option in Model
2013-03-23 11:30:36 -07:00
Genadi Samokovarov
e91b36c0cb
Don't attach url if passed as an option in Model
2013-03-23 19:34:27 +02:00
Brad Dunbar
42d3588b73
Fix #2417 - Use apply to implement slice.
2013-03-22 08:50:09 -04:00
Casey Foster
c3c48e8784
Revert "lowercase instance var in example code"
...
This reverts commit 8d41eaa81e
2013-03-20 20:23:50 -05:00
Tim Griesser
3a94f4e830
Merge pull request #2412 from philfreo/another-typo
...
Minor typo fixes to docs.
2013-03-20 17:36:12 -07:00
Phil Freo
0b27f871b5
fixing minor typos
2013-03-20 17:03:12 -07:00
Phil Freo
7df8c3013b
more lowercasing of instance vars
2013-03-20 16:53:00 -07:00
Phil Freo
e638d7675e
more lowercasing of instance vars
2013-03-20 16:46:59 -07:00
Casey Foster
495eaae4aa
Merge pull request #2410 from philfreo/master
...
Removing invalid 'set' option in 'Collection#fetch' docs
2013-03-20 16:40:06 -07:00
Casey Foster
5c183b2cad
Merge pull request #2411 from philfreo/another-typo
...
lowercase instance var in example code
2013-03-20 16:38:43 -07:00
