[Pkg-javascript-commits] [backbone] 15/211: Fixing un-released models from refresh'd collections. Issue #128

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag 0.5.0
in repository backbone.

commit 6ea500b0ddffd27ddeb5b86b77d43dab7b3d1281
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Wed Dec 8 16:38:33 2010 -0500

    Fixing un-released models from refresh'd collections. Issue #128
---
 backbone.js        | 14 ++++++++++----
 test/collection.js | 13 +++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/backbone.js b/backbone.js
index ca0da18..8e2b58a 100644
--- a/backbone.js
+++ b/backbone.js
@@ -388,7 +388,7 @@
       this.comparator = options.comparator;
       delete options.comparator;
     }
-    this._boundOnModelEvent = _.bind(this._onModelEvent, this);
+    _.bindAll(this, '_onModelEvent', '_removeReference');
     this._reset();
     if (models) this.refresh(models, {silent: true});
     this.initialize(models, options);
@@ -474,6 +474,7 @@
     refresh : function(models, options) {
       models  || (models = []);
       options || (options = {});
+      this.each(this._removeReference);
       this._reset();
       this.add(models, {silent: true});
       if (!options.silent) this.trigger('refresh', this, options);
@@ -547,7 +548,7 @@
       model.collection = this;
       var index = this.comparator ? this.sortedIndex(model, this.comparator) : this.length;
       this.models.splice(index, 0, model);
-      model.bind('all', this._boundOnModelEvent);
+      model.bind('all', this._onModelEvent);
       this.length++;
       if (!options.silent) model.trigger('add', model, this, options);
       return model;
@@ -561,14 +562,19 @@
       if (!model) return null;
       delete this._byId[model.id];
       delete this._byCid[model.cid];
-      delete model.collection;
       this.models.splice(this.indexOf(model), 1);
       this.length--;
       if (!options.silent) model.trigger('remove', model, this, options);
-      model.unbind('all', this._boundOnModelEvent);
+      this._removeReference(model);
       return model;
     },
 
+    // Internal method to remove a model's ties to a collection.
+    _removeReference : function(model) {
+      delete model.collection;
+      model.unbind('all', this._onModelEvent);
+    },
+
     // Internal method called every time a model in the set fires an event.
     // Sets need to update their indexes when models change ids. All other
     // events simply proxy through. "add" and "remove" events that originate
diff --git a/test/collection.js b/test/collection.js
index 3f2f84b..8ed704a 100644
--- a/test/collection.js
+++ b/test/collection.js
@@ -84,6 +84,19 @@ $(document).ready(function() {
     equals(otherRemoved, null);
   });
 
+  test("Collection: events are unbound on remove", function() {
+    var counter = 0;
+    var dj = new Backbone.Model();
+    var emcees = new Backbone.Collection([dj]);
+    emcees.bind('change', function(){ counter++; });
+    dj.set({name : 'Kool'});
+    equals(counter, 1);
+    emcees.refresh([]);
+    equals(dj.collection, undefined);
+    dj.set({name : 'Shadow'});
+    equals(counter, 1);
+  });
+
   test("Collection: remove in multiple collections", function() {
     var modelData = {
       id : 5,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/backbone.git