Revert "Revert "Revert "[FIX] Don't initialize script component multi…

…ple times""" This reverts commit ed444a1.
playcanvas · Jul 30, 2015 · 190bcf6 · 190bcf6
1 parent 0ddd6af
commit 190bcf6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/framework/components/script/script_component.js b/src/framework/components/script/script_component.js
@@ -91,8 +91,6 @@ pc.extend(pc, function () {
                 this.system._destroyScriptComponent(this);
 
                 this.data.areScriptsLoaded = false;
-                this.data.initialized = false;
-                this.data.postInitialized = false;
 
                 // get the urls
                 var scripts = newValue;

diff --git a/src/framework/components/script/script_system.js b/src/framework/components/script/script_system.js
@@ -113,7 +113,7 @@ pc.extend(pc, function () {
             this._registerInstances(root);
 
             if (root.enabled) {
-                if (root.script && root.script.enabled && !root.script.data.initialized) {
+                if (root.script && root.script.enabled) {
                     this._initializeScriptComponent(root.script);
                 }
 
@@ -136,7 +136,7 @@ pc.extend(pc, function () {
          */
         onPostInitialize: function (root) {
             if (root.enabled) {
-                if (root.script && root.script.enabled && !root.script.data.postInitialized) {
+                if (root.script && root.script.enabled) {
                     this._postInitializeScriptComponent(root.script);
                 }