Commit Graph

656 Commits

Author SHA1 Message Date
Jeremy Ashkenas
478ef5c4b4 Merge pull request #736 from braddunbar/nested-set
Multiple nested calls to set
2011-11-09 11:04:46 -08:00
Brad Dunbar
20a2e3408a set _changing = false only if !alreadyChanging 2011-11-09 13:56:43 -05:00
Jeremy Ashkenas
7ece4ef2fd Revert "fixing whitespace consistency for #718"
This reverts commit a0843bb2ee.
2011-11-08 21:14:38 -05:00
Tim Branyen
0ccbba7794 Merge pull request #733 from wookiehangover/whitespace
fixing whitespace consistency for #718
2011-11-08 16:32:03 -08:00
Sam Breed
a0843bb2ee fixing whitespace consistency for #718
all functions are formatted as such: `function(args) { ...`
2011-11-08 17:13:53 -07:00
Tim Branyen
d9f4479845 Merge pull request #721 from TrisMcC/fix-model-trigger
Trigger error on originalModel not model
2011-11-08 11:55:27 -08:00
Jeremy Ashkenas
f9ae1a1686 Merge pull request #722 from jasonm/jm-format-function-defs
Make function definition formatting consistent for docs
2011-11-04 13:32:27 -07:00
Jason Morrison
becb826168 Make function definition formatting consistent 2011-11-04 16:22:05 -04:00
Tristan McCann
da51087dbf Trigger error on originalModel not model
The original model that the 'sync' request was called in should be the
object that is taking the 'error' trigger.

After a 'fetch' request on a collection, 'model' is the jQuery xhr
object, which does not have a 'trigger' method.
2011-11-04 16:02:03 -04:00
Jeremy Ashkenas
7070c27d1c Merge pull request #717 from JustinDrake/patch-1
Making unbind and trigger more compatible with each other
2011-11-03 17:43:19 -07:00
Justin
f17747e041 This means that after unbinding every event, a trigger call will return faster, because !(calls = this._callbacks) will evaluate to true. 2011-11-03 22:30:36 +00:00
Jeremy Ashkenas
eec7d2ac14 Adding AudioVroom as an example app. 2011-10-31 15:45:43 -04:00
Jeremy Ashkenas
3392d5fba9 relying on _.escape, and fixing a lint problem. 2011-10-31 12:35:02 -04:00
Jeremy Ashkenas
18be7107c7 fixing broken comparison. 2011-10-31 11:56:53 -04:00
Jeremy Ashkenas
35600be547 Merge branch 'events' of https://github.com/braddunbar/backbone 2011-10-31 11:49:04 -04:00
Jeremy Ashkenas
39061ff48a Merge branch 'master' of github.com:documentcloud/backbone 2011-10-31 11:00:02 -04:00
Jeremy Ashkenas
5ebbeb0ce2 Fixes #659 2011-10-31 10:59:54 -04:00
Jeremy Ashkenas
fdbd3ee0bd Merge pull request #705 from oldAdam/master
Fix Todos example
2011-10-31 07:44:47 -07:00
Brad Dunbar
6da0683605 create empty tail as an invariant 2011-10-31 10:36:30 -04:00
Brad Dunbar
de2430554e implement callbacks as linked list 2011-10-31 07:15:03 -04:00
Kyle Chaplin
0cd5b938d3 Fix Todos example by importing the currently shipped version of jQuery that is located in /test/vendor. 2011-10-30 14:18:42 -05:00
Tim Branyen
2156b9e28f Merge pull request #699 from jasonm/jm-bump-qunit
Update QUnit to 1.1.0 (newest stable)
2011-10-29 14:03:11 -07:00
Tim Branyen
9982e314cb Merge pull request #700 from iros/673
#673 - Adding index as a property on the options object that gets passed
2011-10-29 13:30:58 -07:00
Irene Ros
80769fcf99 #673 - Adding index as a property on the options object that gets passed when the add/remove callbacks get triggered on a collection. 2011-10-29 16:29:18 -04:00
Tim Branyen
fbffb36819 Merge pull request #698 from alexgraul/master
Fix for Issue #690
2011-10-29 13:21:15 -07:00
Alex Graul
afc2d99b46 nicer again 2011-10-29 16:19:04 -04:00
Jason Morrison
6717e42849 Bump jQuery test suite dependency from 1.5 to 1.6.4 2011-10-29 16:18:19 -04:00
Alex Graul
79eea1dc3c better method names 2011-10-29 16:16:02 -04:00
Jason Morrison
c336e4b3d5 Update QUnit 2011-10-29 16:12:36 -04:00
Jason Morrison
e2f1350266 gitignore vim swapfiles 2011-10-29 16:11:47 -04:00
Jeremy Ashkenas
b2407efb43 Merge branch 'router_no_callback' of https://github.com/derickbailey/backbone 2011-10-29 15:53:32 -04:00
Alex Graul
970ce0762c fix for wrapped errors inside success callbacks on save, issue #690 2011-10-29 15:51:41 -04:00
Jeremy Ashkenas
8478567ecb Needs testing, but fixes #686, fixes #592, and probably others -- allow you to override any $.ajax options. 2011-10-29 14:15:33 -04:00
Jeremy Ashkenas
c37e2f9bd1 Merge branch 'master' of https://github.com/alexgraul/backbone 2011-10-29 13:28:02 -04:00
Alex Graul
567e0a3c2d Fix for adding models with custom set methods to collections, issue #539 2011-10-29 13:23:01 -04:00
Jeremy Ashkenas
de740f8ab5 Fixes #552 #693, allowing unset to work with changedAttributes() 2011-10-29 13:12:33 -04:00
Jeremy Ashkenas
b4f680e371 Merge branch 'master' of https://github.com/iros/backbone 2011-10-29 12:39:38 -04:00
Jeremy Ashkenas
d94cfe506c Fixes #689, documenting the need to resort collections with comparators. 2011-10-29 12:36:23 -04:00
Irene Ros
2be771412b Setting _unsetAttributes to false in unset rather than changedAttributes so that the unset attributes aren't lost on subsequent calls of changedAttributes. Added test to verify this behavior. 2011-10-29 12:27:46 -04:00
Irene Ros
d50c5e980b Adding a _unsetAttributes property on model that stores unset attributes and appends them to the changedAttributes object. 2011-10-29 12:15:45 -04:00
Irene Ros
f6a73ff21d Reducing the amount of properties we are iterating over by removing the old properties that already exist in now. To do that, previousAttributes had to be cloned. Changing "void 0" return to "undefined". 2011-10-29 11:51:41 -04:00
Irene Ros
f499fc8cfc Merge branch 'master' of github.com:spmason/backbone 2011-10-29 11:39:35 -04:00
Jeremy Ashkenas
32ae113298 upgrading to the latest version of Underscore. 2011-10-29 11:24:36 -04:00
Derick Bailey
6799c8e8be added a test and code to allow a router to define a route with no callback method for the route name 2011-10-06 19:09:53 -05:00
Jeremy Ashkenas
41e470321d forcing a git commit 2011-10-05 09:43:53 -04:00
Jeremy Ashkenas
fa66a222c8 Adding battlefield as an example app. 2011-10-04 13:34:11 -04:00
Jeremy Ashkenas
31d961b6d9 Merge pull request #620 from leshill/clear_events
Clear event callbacks with clearEvents
2011-09-19 10:42:06 -07:00
Les Hill
ef40512d84 Rename to undelegateEvents
As suggested by @jashkenas https://github.com/documentcloud/backbone/pull/620#issuecomment-2132400
2011-09-19 10:30:45 -07:00
Les Hill
1aaffa1302 Clear event callbacks with clearEvents 2011-09-18 23:29:51 -07:00
Jeremy Ashkenas
c62e613674 Merge pull request #617 from rgieseke/patch-1
Fix typo.
2011-09-16 11:30:49 -07:00