Add/use init methods for ScriptType and EventHandler (playcanvas#2879)

kungfooman · willeastcott · web-flow · commit e7115594f535 · 2021-02-17T12:01:57.000Z
* Add/use init methods for ScriptType and EventHandler

* Reorder imports

Co-authored-by: Will Eastcott &lt;will@playcanvas.com&gt;
diff --git a/src/core/event-handler.js b/src/core/event-handler.js
@@ -16,6 +16,10 @@
  */
 class EventHandler {
     constructor() {
+        this.initEventHandler();
+    }
+
+    initEventHandler() {
         this._callbacks = { };
         this._callbackActive = { };
     }
diff --git a/src/script/script-type.js b/src/script/script-type.js
@@ -48,7 +48,10 @@ var funcNameRegex = new RegExp('^\\s*function(?:\\s|\\s*\\/\\*.*\\*\\/\\s*)+([^\
 class ScriptType extends EventHandler {
     constructor(args) {
         super();
+        this.initScriptType(args);
+    }
 
+    initScriptType(args) {
         var script = this.constructor; // get script type, i.e. function (class)
 
         // #ifdef DEBUG
diff --git a/src/script/script.js b/src/script/script.js
@@ -1,3 +1,5 @@
+import { EventHandler } from '../core/event-handler.js';
+
 import { ScriptHandler } from '../resources/script.js';
 
 import { script } from '../framework/script.js';
@@ -61,7 +63,8 @@ function createScript(name, app) {
         throw new Error('script name: \'' + name + '\' is reserved, please change script name');
 
     var scriptType = function (args) {
-        ScriptType.call(this, args);
+        EventHandler.prototype.initEventHandler.call(this);
+        ScriptType.prototype.initScriptType.call(this, args);
     };
 
     scriptType.prototype = Object.create(ScriptType.prototype);
