Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Apr 25, 2012
@afeld update changelog for 1.1.2 f8a3a24
Commits on Apr 29, 2012
@afeld fix remove() not firing 'remove' event when last element of array is
removed - fixes #19
6c18a3b
@afeld simplify add() to use 'ary[]' syntax 02aeef5
Commits on Apr 30, 2012
@afeld remove special append syntax for nested arrays
created too many special cases
cbf0ca2
@afeld thow error if add() is called on non-array ea8b9cd
Commits on May 01, 2012
@afeld simplify check for array source value ec19f64
Commits on May 16, 2012
@michaelcox michaelcox Added failing test for #20 ea837d9
@michaelcox michaelcox Added test to assert remove event is fired after model is updated. Re…
…lated to #20.
2efacc0
@michaelcox michaelcox Added delayed 'add' events queue to fix #20. c389754
@michaelcox michaelcox Added failing test for #23 5deb2fa
@michaelcox michaelcox Added failing test for #18 to test completely clearing an array, not …
…just resizing it smaller.
02afcd6
@michaelcox michaelcox add() now returns the model instead of undefined. 9e3c0e4
Commits on May 20, 2012
@afeld Merge pull request #26 from michaelcox/add-returns-model
Pull Request: add() now returns the model instead of undefined.
a11a2c0
@afeld Merge branch 'master' of github.com:afeld/backbone-nested 2c70312
@afeld Merge remote-tracking branch 'origin/master' into michaelcox-issue-20
Conflicts:
	test/nested-model.js
94fd4fa
@afeld create delayedTrigger method 6c2c37f
@afeld added failing test for overriding attributes fda1102
@afeld create walkPath method 06c58a1
Commits on May 23, 2012
@trevorquinn trevorquinn Fix for issue 28 2c4125f
Commits on Jun 01, 2012
@afeld start to convert set() to use walkpath() (broken) c9d85c9
@afeld more _setAttr() cleanup (still broken) aff423d
@afeld Merge commit '02afcd60efa3ea73ac3eca4581748eeffbcb24de' into override
Conflicts:
	test/nested-model.js
f2aa7fb
Commits on Jun 02, 2012
@michaelcox michaelcox All tests pass with new walkPath strategy. 943b25a
@michaelcox michaelcox Change event should not fire if new values match existing values. 0572fb3
@michaelcox michaelcox Remove+Change events now fired when doing a remove() 51ed636
Commits on Jun 05, 2012
@michaelcox michaelcox Minor changes to pass jsHint 1a1b187
@michaelcox michaelcox Added sinon and converted first test. a45dfc7
Commits on Jun 06, 2012
@trevorquinn trevorquinn Merging upstream changes 76fa75d
Commits on Jun 07, 2012
@michaelcox michaelcox Replaced remaining event tests with sinon spies. 701126d
Commits on Jun 08, 2012
@michaelcox michaelcox Stopped double fire of trigger when removing deeply nested items. 621caf3
@afeld Merge pull request #32 from michaelcox/issue-31
Use Sinon.js to test event firing
572e8f1
@afeld Merge pull request #29 from trevorquinn/issue28
don't fire 'change' events if validation fails
f35fd52
@afeld syntax and spacing cleanup 9b4b173
Commits on Jun 10, 2012
@afeld add special logic to ensure whole attribute chain isn't removed when
unsetting a nested attribute - fixes #21
943566e
Commits on Jun 12, 2012
@trevorquinn trevorquinn changedAttributes() should return the attributes for the full path an…
…d all sub-paths for conventional set
49c1d5f
Commits on Jun 14, 2012
@michaelcox michaelcox Added validation tests for top level and nested attributes. 6342911
@michaelcox michaelcox Added test to confirm add() fails when validation fails. 01b0bc7
@afeld add test runner for PhantomJS - first step towards #17 4dae23b
@afeld clean up validation tests bc28216
@afeld Merge branch 'michaelcox-issue-33'
Conflicts:
	README.md
d56ff6b
@afeld Merge branch 'master' into changedAttrs fd331e0
@afeld build on Travis - related to #17 c76700b
Commits on Jun 18, 2012
@afeld change event should wait for the attributes to be set - fixes #37 79a54a4
@afeld upgrade jQuery, and vendor it locally to run tests faster 21b9538
@afeld Merge branch 'master' into missing-changedattrs 62afdf3
@afeld simplify delay of change events 0c57e6d
Commits on Jun 19, 2012
@afeld Merge branch 'master' into missing-changedattrs 45e6c7e
@afeld fix values of changedAttributes e25df37
@afeld only print failed tests in node runner 2847a49
Commits on Jul 02, 2012
George Erickson adding a package.json for jam support 14272e6
@afeld Merge pull request #40 from GeorgeErickson/master
Jam support
476a8ab
Commits on Aug 24, 2012
@isakb isakb Add test for issue #42 (clear) 60877c7
@isakb isakb Fix issue #42 and issue #35
- #clear() now clears attributes as expected.
- #changedAttributes now behaves according to the test
593f6d4
@afeld Merge pull request #48 from isakb/fix-issue-42-and-35
Fix issue 42 and 35
2edcbaf
@afeld change build status icon to use master branch 1b6d05a
@isakb isakb Remove .unset() - not needed. 0975a97
@isakb isakb Add tests for issue #49 and fix them c58a6ad
@isakb isakb Some cleanup, rethink validation on clear
- Remove unnecessary cloning
- Validate {} instead of a clone of attributes where each value
  has been set to void 0
cddf046
@isakb isakb Also set bracket style array index in changed d2cc421
Commits on Aug 25, 2012
@isakb isakb Simpler changedAttributes - toplevel array only c85d04f
@isakb isakb Add jslitmus 67e2535
@isakb isakb Add some speed tests c312773
@afeld use square-bracket syntax only for arrays in changedAttributes() 61e128a
@afeld make clear() more efficient by only looping once a922f62
@afeld make clear() more efficient 1fdb54d
@afeld add README note re: clear() fix 3bd2122
@afeld README update re: change events when value hasn't changed 5bf3620
@afeld use grunt for testing/linting - closes #39 4c1c5d8
@afeld fix jshint errors from grunt 4d4aa30
Commits on Aug 26, 2012
@afeld Merge branch 'master' into nested-changed
Conflicts:
	README.md
	backbone-nested.js
ad17a3a
Commits on Sep 23, 2012
@afeld upgrade sinon 05b1c62
@afeld upgrade qunit 53700df
Commits on Oct 03, 2012
@bendangelo bendangelo silent now prevents change event dd6e2f5
@afeld Merge pull request #64 from bendangelo/master
Trigger Change Silent Fix
32b1ed0
Commits on Jun 25, 2013
@eddieantonio eddieantonio Patched collection add bug. 0b30413
@afeld Merge pull request #77 from eddieantonio/master
Patched "Initializing Nested Attributes" for Backbone 1.0.0
fc1474a
Commits on Jul 15, 2013
@wonnage wonnage Break out of circular references when walking through properties
Backbone collections set up a circular reference: collection[i] is a reference
to a model, and model.collection is a reference back to the collection.
checkChanges needs to not run in circles when encountering this.
e13c326
@afeld Merge pull request #80 from wonnage/master
Check for circular references in checkChanges
3a5a331
Commits on Sep 06, 2013
lizn add options argument to :
setChanged
_delayedChange
_delayedTrigger
c51a4c1
lizn 1. add unit test for options argument b880f87
@afeld Merge pull request #84 from zincli/master
Add options argument to change:nested.property event's handle function
5187597
Commits on Sep 11, 2013
@lovetheidea lovetheidea use underscore indexOf for <= IE8 705dad8
@afeld Merge pull request #85 from lovetheidea/patch-1
use underscore indexOf for  <= IE8
605a1d1
Commits on Sep 26, 2013
@gkatsev gkatsev update grunt. Fix breaking tests 3620728
@gkatsev gkatsev update package.json 50cb584
@gkatsev gkatsev pesky semicolon 0ec8a17
@gkatsev gkatsev update travis.yml dc224bb
@gkatsev gkatsev update package.json d587b16
@gkatsev gkatsev update jshint config in gruntfile 1773d19
@afeld Merge pull request #88 from gkatsev/grunt
update grunt. Fix breaking tests
2a927e0
Commits on Sep 27, 2013
@afeld add note about associations a278b11
@afeld Merge pull request #91 from afeld/afeld-patch-1
add note about associations
274500d
Commits on Oct 21, 2013
@gkatsev gkatsev switch to bower to manage deps. 0ec4ea7
@gkatsev gkatsev Make sure the name is correct and add a version b427899
@gkatsev gkatsev update demo bdade94
@gkatsev gkatsev depend on the correct version of backbone 4ec8b6f
@gkatsev gkatsev install bower on travis 668e2af
@gkatsev gkatsev a working version of sinon 7e5f4e3
@gkatsev gkatsev use backbone 1.0 c84b8d3
Commits on Oct 22, 2013
@gkatsev gkatsev make sure that tests pass against backbone model 56163e2
@gkatsev gkatsev get main tests to pass 3c6d883
@gkatsev gkatsev have qunit create it's own html 109b016
@gkatsev gkatsev tests that run against backbone and nested model should be modularize…
…d differently
f900fc5
@gkatsev gkatsev validate models 688b1e0
@gkatsev gkatsev When unsetting an array item, fire remove event. ad8e957
@gkatsev gkatsev use custom sinon-qunit for now.
The version that bower uses enabled fakeTimers in sinon which we don't want.
99aad92
Commits on Oct 23, 2013
@gkatsev gkatsev Update to backbone 1.1.0 e0e34d5
@gkatsev gkatsev use backbone tests directly 72a4a6a
@gkatsev gkatsev make sure that unsetting using set with an object works 17f3c12
@gkatsev gkatsev validate properly on clear 88c3b66
@gkatsev gkatsev move var to top of scope. b95d8a4
@gkatsev gkatsev only call validate function once. Get value of whether it was validat…
…ed from Backbone.Model's set
e5f0764
Commits on Oct 24, 2013
@gkatsev gkatsev when unsetting, we should use (void 0) or undefined rather than null 63ea852
@gkatsev gkatsev Update version 14bb6e3
Commits on Oct 25, 2013
@afeld Merge pull request #95 from gkatsev/bower-deps
switch to bower to manage deps.
9e3f9d2
Commits on Dec 30, 2013
@gkatsev gkatsev remove unneeded test code 8b483fb
@gkatsev gkatsev null attributes rather than undefined attributes 3d3b451
@gkatsev gkatsev add comment about drop-in replacement test runner b02052a
Commits on Jan 06, 2014
@gkatsev gkatsev Make changedAttributes return nested values
This is mostly there. There's a problem with clear() right now.
b1a8a04
@gkatsev gkatsev clear out nestedChanges on clear() 9d27028
@gkatsev gkatsev Moving Backbone.Model setting to setup and teardown 8075910
Commits on Jan 07, 2014
@gkatsev gkatsev changedAttribute fixup. No support for nested set 97a5136
@gkatsev gkatsev only hold right keys in nestedChanges object 7321e35
Commits on Jan 08, 2014
@gkatsev gkatsev Update package.json deps
Update backbone dep to ~1.1.0
Move jslitmus to be a devDep.
c150ba8
@gkatsev gkatsev Revert "Update version"
This reverts commit 14bb6e3.
628c833
@gkatsev gkatsev Merge branch 'master' into backbone1.0 ad4ec28
@gkatsev gkatsev Comment why clone attrs needed in clear() 029c2d1
@gkatsev gkatsev Remove bower resolutions 1a727e4
@afeld remove 'resolutions' from bower config 4841ee3
@afeld only run Backbone.Model tests in one place ada4a6c
@afeld consolidate test files ecb3c56
@gkatsev gkatsev Merge pull request #1 from afeld/bb1-tweaks
Backbone 1.0 tweaks
f18f80a
@gkatsev gkatsev relax backbone dependency version constraints cf18ed1
@afeld Merge pull request #96 from gkatsev/backbone1.0
Backbone 1.x
c62814a
@afeld improve bower specification 48611aa
@afeld update Bower package name
has also been registered w/ Bower
9747193
Commits on Jan 11, 2014
@afeld Merge pull request #101 from afeld/bower-tweaks
improve bower specification
0f802c6
@afeld move changelog to its own file c9db000
@afeld Merge pull request #103 from afeld/changelog
move changelog to its own file
2512216
Commits on Jan 12, 2014
@afeld simplify docs re: backbone version 9532566
@afeld add changelog notes for unreleased changes 48ee036
@afeld move changelog to Releases page ef76721
@afeld bump to 2.0.0 b373dad
@afeld change installation instructions to use Bower 2abc808
Commits on Jan 29, 2014
@afeld Merge pull request #104 from afeld/next-release
v2.0.0
99c70bd
@bartek bartek Add support for CommonJS, AMD, and global namespace usage methods. e1ec181
@bartek bartek Add jquery, underscore to package.json dependencies
This way, require('backbone') just works as expected.
1fbebb2
@bartek bartek Resolve jshint warnings. 73dd489
@gkatsev gkatsev Change repositories field to repository field 001ab86
@afeld Merge pull request #111 from gkatsev/package.json/repository
Change repositories field to repository field
7d22c38
@bartek bartek Add test to ensure NestedModel is attached to Backbone when using req…
…uire()

Introduces tape and a new grunt task, because mixing in this type of test
with qunit seemed to be a pain. This separates the two environments while
keeping consistent with a method to run tests.
f3dd12e
Commits on Jan 30, 2014
@bartek bartek Use grunt-mocha-test instead of grunt-tape due to node 0.8 compatibil…
…ites

Ends up coming from the writable stream here:
tapjs/tap-parser#9 (comment)
27634ee
@afeld Merge pull request #110 from bartek/commonjs-friendly
Add support for CommonJS, AMD, and global namespace usage methods.
01c6a2d
Commits on Feb 18, 2014
@karlwestin karlwestin To determine whether a newly created nest-level should be an object or
an array, we need to look at the next value in the path.
Please run the tests without the patch in backbone-nested to see the bug
in action. Thanks

Closes #78
4688a4e
@karlwestin karlwestin Remove extra whitespace + fix test typo 88591e9
Commits on Feb 19, 2014
@afeld Merge pull request #113 from karlwestin/fix-78
Look ahead one step when building nested structures (#78)
1b7aa64
Commits on Jul 22, 2014
@afeld bump to v2.0.1 19d4efd
@afeld restrict NPM installs based on installed node version
attempt to fix build on Node 0.8, where NPM was attempting to install
Bower 1.3.8, which is incompatible

npm/npm#3662 (comment)
835e2bd
@afeld dont install bower on travis fd923ca
@afeld dont test on node 0.8
bower fails to install
1458d1b
@afeld Merge pull request #121 from afeld/engines
restrict NPM installs based on installed node version
5ba8025
Commits on Jan 14, 2015
@afeld link to discussion w/ backbone-deep-model a05018f
@afeld change language ac196af
Commits on Mar 13, 2015
@fcamblor fcamblor Added tests for previous() f480327
@fcamblor fcamblor Provided implementation for previous(), relying on static function 'w…
…alkThenGet' shared with get()
0b5c06b
@afeld Merge pull request #133 from fcamblor/fix-previous
Fix previous
13ceba4
@afeld bump to v2.0.2 7f13f57
Commits on May 04, 2015
kent.willis #112 removed bower as a peer dependency in package.json 3b038e6
kent.willis Added bower install for local testing cde6a49
kent.willis Removed Grunt install for bower and moved into package.json 45443ff
@afeld Merge pull request #136 from kentmw/master
#112 removed bower as a peer dependency in package.json
87f747e
@afeld bump to 2.0.3 6f0e9cc
Commits on Jul 15, 2015
@agoldis agoldis #68 - changed nestedChanges and _delayedTriggers scope, added tests a…
…ccordingly
d9a7673
@agoldis agoldis fixed typo 68026be
Commits on Jul 27, 2015
@afeld Merge pull request #140 from agoldis/master
issue #68 fix - changed `nestedChanges` and `_delayedTriggers` scope, added tests accordingly
85030d2
@afeld bump to 2.0.4 9078583