Fix for EntityContainer attempting to trigger events once it is destr…

…oyed. Built 0.7.2.
PBS-KIDS · Feb 9, 2016 · 19501d9 · 19501d9
1 parent 0d7baba
commit 19501d9
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
 	"name": "Platypus",
-	"version": "0.7.1",
+	"version": "0.7.2",
 	"homepage": "https://github.com/PBS-KIDS/Platypus",
 	"authors": [
 		"probityrules",

diff --git a/build/package.json b/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Platypus",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "Platypus Docs",
   "url": "https://github.com/PBS-KIDS/Platypus",
   "logo": "assets/platypus-title.png",

diff --git a/docs/Platypus_docs-0.7.1.zip b/docs/Platypus_docs-0.7.1.zip
diff --git a/docs/Platypus_docs-0.7.2.zip b/docs/Platypus_docs-0.7.2.zip
diff --git a/lib/platypus.combined.js b/lib/platypus.combined.js
@@ -3127,15 +3127,15 @@ this.platypus = this.platypus || {};
 	 * @type String
 	 * @static
 	 **/
-	platypus.version = /*=version*/"0.7.1"; // injected by build process
+	platypus.version = /*=version*/"0.7.2"; // injected by build process
 
 	/**
 	 * The build date for this release in UTC format.
 	 * @property buildDate
 	 * @type String
 	 * @static
 	 **/
-	platypus.buildDate = /*=date*/"Tue, 09 Feb 2016 14:48:45 GMT"; // injected by build process
+	platypus.buildDate = /*=date*/"Tue, 09 Feb 2016 18:30:02 GMT"; // injected by build process
 
 })();
 
@@ -12644,12 +12644,21 @@ platypus.CollisionShape = (function () {
             },
 
             triggerEventOnChildren: function (event, message, debug) {
+                if (this.destroyed) {
+                    return 0;
+                }
+
                 if (!this._listeners[event]) {
                     this.addNewPrivateEvent(event);
                 }
                 return this.triggerEvent(event, message, debug);
             },
+
             triggerOnChildren: function (event, message, debug) {
+                if (this.destroyed) {
+                    return 0;
+                }
+
                 if (!this._listeners[event]) {
                     this.addNewPrivateEvent(event);
                 }

diff --git a/lib/platypus.min.js b/lib/platypus.min.js
diff --git a/src/components/EntityContainer.js b/src/components/EntityContainer.js
@@ -351,12 +351,21 @@
             },
 
             triggerEventOnChildren: function (event, message, debug) {
+                if (this.destroyed) {
+                    return 0;
+                }
+
                 if (!this._listeners[event]) {
                     this.addNewPrivateEvent(event);
                 }
                 return this.triggerEvent(event, message, debug);
             },
+
             triggerOnChildren: function (event, message, debug) {
+                if (this.destroyed) {
+                    return 0;
+                }
+
                 if (!this._listeners[event]) {
                     this.addNewPrivateEvent(event);
                 }