repo: janusweb
action: commit
revision: 
path_from: 
revision_from: abf9495d846638c41631e34959da49dd29370079:
path_to: 
revision_to: 

commit abf9495d846638c41631e34959da49dd29370079
Author: James Baicoianu 
Date:   Mon Jul 13 11:37:51 2020 -0700

    Script loading fixes

diff --git a/scripts/room.js b/scripts/room.js

--- a/scripts/room.js
+++ b/scripts/room.js
@@ -856,10 +856,11 @@ elation.require([
     }
     this.loadScripts = function(scripts) {
       scripts.forEach(elation.bind(this, function(s) {
-        var script = elation.engine.assets.find('script', s.src);
+        var scriptasset = this.getAsset('script', s.src);
         this.pendingScripts++;

-        if (script._loaded) {
+        let script = scriptasset.getInstance();
+        if (scriptasset.loaded) {
           // If the script is already part of the document, remove it and readd it so it's reevaluated
           if (script.parentNode) {
             script.parentNode.removeChild(script);
@@ -869,13 +870,13 @@ elation.require([
           script = document.createElement('script');
           script.src = oldscript.src;
           document.head.appendChild(script);
+        } else {
+          elation.events.add(script, 'asset_load', elation.bind(this, function() {
+            script.onload = elation.bind(this, this.doScriptOnload);
+            document.head.appendChild(script);
+          }));
         }
         this.roomscripts.push(script);
-        elation.events.add(script, 'asset_load', elation.bind(this, function() {
-          script._loaded = true;
-          document.head.appendChild(script);
-          script.onload = elation.bind(this, this.doScriptOnload);
-        }));
       }));
     }
     this.getTranslator = function(url) {

-----END OF PAGE-----