Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-24 03:05:41 +00:00
Code Issues Projects Releases Wiki Activity

refactored

Browse source
This commit is contained in:
coderaiser 2012-10-20 14:07:06 -04:00
parent 5048f9b1c5
commit 34987517c2
2 changed files with 44 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

56
client.js
View file

@ -282,27 +282,6 @@ CloudClient.Util = (function(){
};
/**
* function loads a couple js files one-by-one
* @pSrc_a ([String1, ..., StringN])
* @pCallBack (functin)
*/
this.jsloadOnLoad = function (pSrc_a, pCallBack){
if( this.isArray(pSrc_a) ) {
var n = pSrc_a.length;
for(var i=0; i<n; i++)
pSrc_a[i] = {
name: 'script',
src : pSrc_a[i]
};
pSrc_a[0].func = pCallBack;
this.anyLoadOnload(pSrc_a);
}
};
/*
* Функция создаёт элемент и
* загружает файл с src.
* @pName - название тэга
@ -313,7 +292,7 @@ CloudClient.Util = (function(){
* @pStyle - стиль
* @pId - id
* @pElement - элемент, дочерним которо будет этот
* @pParams_o = {name: '', src: ' ',func: '', style: '', id: '', parent: '',
* @param pParams_o = {name: '', src: ' ',func: '', style: '', id: '', parent: '',
async: false, inner: 'id{color:red, }, class:'', not_append: false}
*/
this.anyload = function(pParams_o){
@ -326,21 +305,23 @@ CloudClient.Util = (function(){
*/
if( this.isArray(pParams_o) ){
var lElements_a = [];
for(var i=0; i < pParams_o.length; i++)
for(var i=0, n = pParams_o.length; i < n ; i++)
lElements_a[i] = this.anyload(pParams_o[i]);
return lElements_a;
}
/* убираем путь к файлу, оставляя только название файла */
var lName = pParams_o.name,
lID = pParams_o.id,
lClass = pParams_o.className,
lSrc = pParams_o.src,
lFunc = pParams_o.func,
lAsync = pParams_o.async,
lParent = pParams_o.parent;
var lName = pParams_o.name,
lID = pParams_o.id,
lClass = pParams_o.className,
lSrc = pParams_o.src,
lFunc = pParams_o.func,
lAsync = pParams_o.async,
lParent = pParams_o.parent,
lInner = pParams_o.inner,
lNotAppend = pParams_o.not_append;
if(!lID && lSrc)
lID = this.getIdBySrc(lSrc);
@ -371,6 +352,7 @@ CloudClient.Util = (function(){
if(lClass)
element.className = lClass;
/* if working with external css
* using href in any other case
* using src
@ -427,11 +409,11 @@ CloudClient.Util = (function(){
if(lAsync || lAsync === undefined)
element.async = true;
if(!pParams_o.not_append)
if(!lNotAppend)
(lParent || document.body).appendChild(element);
if(pParams_o.inner){
element.innerHTML = pParams_o.inner;
if(lInner){
element.innerHTML = lInner;
}
}
/* если js-файл уже загружен
@ -442,9 +424,9 @@ CloudClient.Util = (function(){
lFunc();
else if( this.isObject(lFunc) && this.isFunction(lFunc.onload) )
lFunc.onload();
lFunc.onload();
}
return element;
},
@ -456,7 +438,7 @@ CloudClient.Util = (function(){
return this.anyload(pSrc);
}
return this.anyload({
name : 'script',
src : pSrc,

52
lib/client/viewer.js
View file

@ -18,10 +18,10 @@ var CloudCommander, CloudFunc, $;
cloudcmd.Viewer.dir = './lib/client/viewer/';
FancyBox.dir = cloudcmd.Viewer.dir + 'fancybox/';
/* PRIVATE FUNCTIONS */
function set(){
function set(){
if(Util.getByClass('fancybox').length)
return;
try{
@ -105,35 +105,33 @@ var CloudCommander, CloudFunc, $;
* @pCallBack - executes, when everything loaded
*/
FancyBox.load = function(pCallBack){
var ljsLoad_f = function(){
var lSrc = FancyBox.dir + 'jquery.fancybox.js';
Util.jsload(lSrc,{
onload: pCallBack
console.time('fancybox load');
var lDir = FancyBox.dir;
Util.anyLoadOnload([
lDir + 'jquery.fancybox.css',
lDir + 'jquery.fancybox.js'],
function(){
console.timeEnd('fancybox load');
pCallBack();
});
};
Util.cssSet({id:'viewer',
inner : '#CloudViewer{' +
'font-size: 16px;' +
'white-space :pre' +
'}' +
'#CloudViewer::selection{' +
/*
'background: #fe57a1;'
'color: #fff;'
*/
'background: #b3d4fc;' +
'text-shadow: none;' +
'}'
});
var lSrc = FancyBox.dir +'jquery.fancybox.css';
Util.cssLoad({
src : lSrc,
func : {
onload: ljsLoad_f
}
inner : '#CloudViewer{' +
'font-size: 16px;' +
'white-space :pre' +
'}' +
'#CloudViewer::selection{' +
/*
'background: #fe57a1;'
'color: #fff;'
*/
'background: #b3d4fc;' +
'text-shadow: none;' +
'}'
});
};
/**