github/backbone
1
1
Fork 0
mirror of https://github.com/jashkenas/backbone.git synced 2026-04-30 03:00:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix _onModelEvent regression

Browse Source 
Fixes #3662.
This commit is contained in:
Justin Ridgewell
2015-10-22 11:06:39 -04:00
parent fee53ab464
commit 67667c5b8f
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backbone.js
View File

@@ -1148,14 +1148,16 @@
// events simply proxy through. "add" and "remove" events that originate
// in other collections are ignored.
_onModelEvent: function(event, model, collection, options) {
if ((event === 'add' || event === 'remove') && collection !== this) return;
if (event === 'destroy') this.remove(model, options);
if (event === 'change') {
var prevId = this.modelId(model.previousAttributes());
var id = this.modelId(model.attributes);
if (prevId !== id) {
if (prevId != null) delete this._byId[prevId];
if (id != null) this._byId[id] = model;
if (model) {
if ((event === 'add' || event === 'remove') && collection !== this) return;
if (event === 'destroy') this.remove(model, options);
if (event === 'change') {
var prevId = this.modelId(model.previousAttributes());
var id = this.modelId(model.attributes);
if (prevId !== id) {
if (prevId != null) delete this._byId[prevId];
if (id != null) this._byId[id] = model;
}
}
}
this.trigger.apply(this, arguments);

10
test/collection.js
View File

@@ -1803,4 +1803,14 @@
collection.invoke('method', 1, 2, 3);
});
QUnit.test('#3662 - triggering change without model will not error', function(assert) {
assert.expect(1);
var collection = new Backbone.Collection([{id: 1}]);
var model = collection.first();
collection.on('change', function(model) {
assert.equal(model, undefined);
});
model.trigger('change');
});
})();