added ability to load a couple scripts after one main is loaded in any position in anyLoadOnLoad function

This commit is contained in:
coderaiser 2012-11-26 07:28:02 -05:00
parent 4d6d005030
commit 2342988071
3 changed files with 40 additions and 35 deletions

View file

@ -91,7 +91,7 @@ var CloudCommander, Util, DOM, CloudFunc;
return lRet_b;
};
/**
/**
* safe add event listener
* @param pType
* @param pListener
@ -100,7 +100,7 @@ var CloudCommander, Util, DOM, CloudFunc;
*/
DOM.addListener = function(pType, pListener, pUseCapture, pElement){
return (pElement || document).addEventListener(
pType,
pType,
pListener,
pUseCapture || false
);
@ -251,16 +251,20 @@ var CloudCommander, Util, DOM, CloudFunc;
*/
DOM.anyLoadOnLoad = function(pParams_a, pFunc){
if( Util.isArray(pParams_a) ) {
var lParam = pParams_a.pop();
if(Util.isString(lParam) )
lParam = { src : lParam };
if(lParam && !lParam.func){
lParam.func = function(){
var lParam = pParams_a.pop(),
lFunc = function(){
DOM.anyLoadOnLoad(pParams_a, pFunc);
};
if( Util.isString(lParam) )
lParam = { src : lParam };
else if( Util.isArray(lParam) ){
DOM.anyLoadInParallel(lParam, lFunc);
}
if(lParam && !lParam.func){
lParam.func = lFunc;
DOM.anyload(lParam);
@ -292,7 +296,7 @@ var CloudCommander, Util, DOM, CloudFunc;
pParams_a = [pParams_a];
}
for(var i = 0, n = pParams_a.length; i < n; i++){
for(var i = 0, n = pParams_a.length; i < n; i++){
var lParam = pParams_a.pop();
if(lParam){
@ -301,7 +305,7 @@ var CloudCommander, Util, DOM, CloudFunc;
if(Util.isString(lParam) )
lParam = { src : lParam };
var lFunc = lParam.func;
var lFunc = lParam.func;
lParam.func = Util.retExec(doneFunc, lFunc);
DOM.anyload(lParam);

View file

@ -85,19 +85,21 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror;
console.time('codemirror load');
var lDir = cloudcmd.LIBDIRCLIENT + 'editor/codemirror/';
DOM.jsload(lDir + 'codemirror.js', function(){
DOM.anyLoadInParallel([
lDir + 'codemirror.css',
lDir + 'theme/night.css',
lDir + 'mode/javascript.js',
DOM.anyLoadOnLoad([
[
lDir + 'codemirror.css',
lDir + 'theme/night.css',
lDir + 'mode/javascript.js',
],
function(){
console.timeEnd('codemirror load');
CodeMirrorLoaded = true;
Util.exec(pCallBack);
});
});
lDir + 'codemirror.js'
],
function(){
console.timeEnd('codemirror load');
CodeMirrorLoaded = true;
Util.exec(pCallBack);
});
}

View file

@ -29,18 +29,17 @@ var CloudCommander, Util, DOM, $, Github, cb;
console.time('github load');
var lDir = './lib/client/storage/github/';
DOM.jsload(lDir + 'github.js', function(){
DOM.anyLoadOnLoad([
lDir + 'lib/base64.js',
lDir + 'lib/underscore.js'],
function(){
console.timeEnd('github load');
DOM.Images.hideLoad();
Util.exec(pCallBack);
});
});
DOM.anyLoadInParallel([
lDir + 'github.js',
lDir + 'lib/base64.js',
lDir + 'lib/underscore.js'],
function(){
console.timeEnd('github load');
DOM.Images.hideLoad();
Util.exec(pCallBack);
});
}
function setConfig(pCallBack){