Updated popcorn-base with teardown bug fix

brianchirls · Apr 10, 2012 · ff23cd2 · ff23cd2
1 parent 91bd439
commit ff23cd2
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/js/popcorn-base.js b/js/popcorn-base.js
@@ -405,7 +405,7 @@
 		teardownFn = definition._teardown;
 		if (typeof teardownFn === 'function') {
 			definition._teardown = function(options) {
-				var parent;
+				var parent, i;
 				if (typeof me.onTeardown === 'function') {
 					try {
 						me.onTeardown.call(me, options);
@@ -414,27 +414,39 @@
 					}
 				}
 				teardownFn.call(me, options);
-				if (me.container && me.container.parentNode) {
+				if (me.container) {
 					parent = me.container.parentNode;
-					parent.removeChild(me.container);
+					if (parent) {
+						parent.removeChild(me.container);
+					}
 					delete me.container;
 				}
+				i = allEvents.indexOf(me);
+				if (i <= 0) {
+					allEvents.splice(i, 1);
+				}
 			};
 		} else {
 			definition._teardown = function(options) {
-				var parent;
+				var parent, i;
 				if (typeof me.onTeardown === 'function') {
 					try {
 						me.onTeardown(options);
 					} catch (e) {
 						logError(e);
 					}
 				}
-				if (me.container && me.container.parentNode) {
+				if (me.container) {
 					parent = me.container.parentNode;
-					parent.removeChild(me.container);
+					if (parent) {
+						parent.removeChild(me.container);
+					}
 					delete me.container;
 				}
+				i = allEvents.indexOf(me);
+				if (i <= 0) {
+					allEvents.splice(i, 1);
+				}
 			};
 		}
 	};