jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Joel Martin 2012-10-18 16:13:00 -05:00
parent 60106f240a
commit 8e2d749605
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
include/util.js
View File

@ -218,17 +218,31 @@ Util.get_include_uri = function() {
return (typeof INCLUDE_URI !== "undefined") ? INCLUDE_URI : "include/";
}
Util._pending_scripts = [];
Util.load_script = function(file, onload) {
var head = document.getElementsByTagName('head')[0];
var script = document.createElement('script');
script.type = 'text/javascript';
script.src = Util.get_include_uri() + file;
// In order script execution for webkit and firefox
// https://developer.mozilla.org/en-US/docs/HTML/Element/script
script.async = false;
if (Util.Engine.trident) {
// In order script execution for IE 9
// http://ui.cognifide.com/slides/async-js/template/#26
script.defer = true;
}
//console.log("loading script: " + Util.get_include_uri() + files[f]);
head.appendChild(script);
if (typeof onload !== "undefined") {
script.onload = script.onreadystatechange = onload;
}
return script;
};
Util.load_scripts = function(files) {
var head = document.getElementsByTagName('head')[0],
ps = Util._pending_scripts;
for (var f=0; f<files.length; f++) {
var script = document.createElement('script');
script.type = 'text/javascript';
script.src = Util.get_include_uri() + files[f];
//console.log("loading script: " + Util.get_include_uri() + files[f]);
head.appendChild(script);
ps.push(script);
script.onload = script.onreadystatechange = function (e) {
var script = Util.load_script(files[f], function (e) {
if (!this.readyState ||
this.readyState == 'complete' ||
this.readyState == 'loaded') {
@ -242,7 +256,8 @@ Util.load_scripts = function(files) {
window.onscriptsload();
}
}
}
});
ps.push(script);
}
}