[FIX] Synchronous loading of scripts that are already loaded

playcanvas · Dec 7, 2015 · 873630d · 873630d
1 parent 20ecba8
commit 873630d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/framework/components/script/script_component.js b/src/framework/components/script/script_component.js
@@ -134,8 +134,16 @@ pc.extend(pc, function () {
             var i, len;
             var cached = [];
 
+            var prefix = this.system._prefix || "";
+            var regex = /^http(s)?:\/\//i;
+
             for (i = 0, len = urls.length; i < len; i++) {
-                var type = this.system.app.loader.getFromCache(urls[i]);
+                var url = urls[i];
+                if (! regex.test(url)) {
+                    url = pc.path.join(prefix, url);
+                }
+
+                var type = this.system.app.loader.getFromCache(url, 'script');
 
                 // if we cannot find the script in the cache then return and load
                 // all scripts with the resource loader