Merge pull request #159 from davej/patch-1

Fix for undefined `this` in event handlers
LeaVerou · Jan 27, 2016 · 2bc1cdf · 2bc1cdf
2 parents b894098 + 21e4f27
commit 2bc1cdf
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/bliss._.js b/bliss._.js
@@ -63,7 +63,7 @@ if (self.EventTarget && "addEventListener" in EventTarget.prototype) {
 	    notEqual = function() { return !equal.apply(this, arguments); };
 
 	EventTarget.prototype.addEventListener = function(type, callback, capture) {
-		if (this[_] && callback) {
+		if (this && this[_] && callback) {
 			var listeners = this[_].bliss.listeners = this[_].bliss.listeners || {};
 
 			listeners[type] = listeners[type] || [];
@@ -77,7 +77,7 @@ if (self.EventTarget && "addEventListener" in EventTarget.prototype) {
 	};
 
 	EventTarget.prototype.removeEventListener = function(type, callback, capture) {
-		if (this[_] && callback) {
+		if (this && this[_] && callback) {
 			var listeners = this[_].bliss.listeners = this[_].bliss.listeners || {};
 
 			if (listeners[type]) {
@@ -93,4 +93,4 @@ if (self.EventTarget && "addEventListener" in EventTarget.prototype) {
 self.$ = self.$ || $;
 self.$$ = self.$$ || $.$;
 
-})(Bliss);
+})(Bliss);