Răsfoiți Sursa

util.js: script load sequential execution changes.

Related to issue: https://github.com/kanaka/noVNC/issues/205

Split out the function to load a single script to Util.load_script.

In order to get sequential load, when on IE set the script defer flag.
It is currently working on webkit and firefox but just in case also
set the script.async flag to make sure that scripts execute in the
order they are added. Scripts should still load in parallel.
Joel Martin 13 ani în urmă
părinte
comite
51562999c7
1 a modificat fișierele cu 5 adăugiri și 4 ștergeri
  1. 5 4
      include/util.js

+ 5 - 4
include/util.js

@@ -242,10 +242,11 @@ Util.load_scripts = function(files) {
                     this.onload = this.onreadystatechange = null;
                     //console.log("completed script: " + this.src);
                     ps.splice(ps.indexOf(this), 1);
-                }
-                // Call window.onscriptsload after last script loads
-                if (ps.length === 0 && window.onscriptsload) {
-                    window.onscriptsload();
+
+                    // Call window.onscriptsload after last script loads
+                    if (ps.length === 0 && window.onscriptsload) {
+                        window.onscriptsload();
+                    }
                 }
             }
         };