Merge pull request #42 from C2FO/fix-memory-leak

Fix memory leak with event binding

Author: jvanwinkle

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "thumbs",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "thumbs.js",
   "author": "Pollenware",
   "ignore": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "thumbs",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "private": true,
   "author": "Pollenware",
   "license": "MIT",

src/thumbs.view.js

@@ -66,6 +66,7 @@ Thumbs.View = (function () {
             this.__identifiers = [];
             this.__monitors = {};
             this.__events = {};
+            this.events = _.clone(this.events || {});
             this._super('initialize', arguments);
             if (this.$el) {
                 this.$el.attr("thumbs-id", this.thumbsId);
@@ -384,16 +385,11 @@ Thumbs.View = (function () {
         },
 
         checkForEvents: function () {
-            var self = this,
-                hasEvents = false;
-            this.events = this.events || {};
+            var self = this;
 
             this.$('[data-thumbs-delegate]').each(function() {
-                hasEvents = self._bindEvents(this) || hasEvents;
+                self._bindEvents(this);
             });
-            if (hasEvents) {
-                this.delegateEvents();
-            }
             return this;
         },
 
@@ -431,6 +427,10 @@ Thumbs.View = (function () {
                 .findEl()
                 .assign(this._subviews)
                 ._super('render', arguments);
+
+            if (!_.isEmpty(this.events)) {
+                this.delegateEvents();
+            }
             return this;
         },
 

test/spec/delegate.spec.js

@@ -21,9 +21,9 @@ describe("Thumbs.View event", function () {
         });
 
         it("adds events set in the template to the events object", function () {
-            expect(view.events).not.toBeDefined();
+            expect(view.events).toEqual({});
             view.render();
-            expect(view.events).toBeDefined();
+            expect(_.keys(view.events).length).toEqual(1);
         });
 
         it("allows events to be set directly on an element", function () {
@@ -55,9 +55,9 @@ describe("Thumbs.View event", function () {
         });
 
         it("adds events set in the template to the events object", function () {
-            expect(view.events).not.toBeDefined();
+            expect(view.events).toEqual({});
             view.render();
-            expect(view.events).toBeDefined();
+            expect(_.keys(view.events).length).toEqual(2);
         });
 
         it("allows events to be set directly on an element", function () {

thumbs.js

@@ -1,6 +1,6 @@
-// Thumbs.js 0.2.0
+// Thumbs.js 0.2.1
 //
-// Copyright (c) 2013 Pollenware.
+// Copyright (c) 2014 Pollenware.
 // Distributed under MIT license.
 //
 // http://thumbsjs.com
@@ -359,6 +359,7 @@
             this.__identifiers = [];
             this.__monitors = {};
             this.__events = {};
+            this.events = _.clone(this.events || {});
             this._super('initialize', arguments);
             if (this.$el) {
                 this.$el.attr("thumbs-id", this.thumbsId);
@@ -677,16 +678,11 @@
         },
 
         checkForEvents: function () {
-            var self = this,
-                hasEvents = false;
-            this.events = this.events || {};
+            var self = this;
 
             this.$('[data-thumbs-delegate]').each(function() {
-                hasEvents = self._bindEvents(this) || hasEvents;
+                self._bindEvents(this);
             });
-            if (hasEvents) {
-                this.delegateEvents();
-            }
             return this;
         },
 
@@ -724,6 +720,10 @@
                 .findEl()
                 .assign(this._subviews)
                 ._super('render', arguments);
+
+            if (!_.isEmpty(this.events)) {
+                this.delegateEvents();
+            }
             return this;
         },