mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-07-22 07:34:16 +00:00
changed sync reading of certs to async
This commit is contained in:
parent
60f489f8a2
commit
b5820350e9
5 changed files with 120 additions and 53 deletions
|
|
@ -536,12 +536,12 @@ var CloudCommander, Util,
|
|||
*/
|
||||
DOM.anyLoadInParallel = function(pParams_a, pFunc){
|
||||
var lRet = this,
|
||||
done = [],
|
||||
lDone = [],
|
||||
|
||||
doneFunc = function (pCallBack){
|
||||
lDoneFunc = function (pCallBack){
|
||||
Util.exec(pCallBack);
|
||||
|
||||
if( !done.pop() )
|
||||
if( !lDone.pop() )
|
||||
Util.exec(pFunc);
|
||||
};
|
||||
|
||||
|
|
@ -553,13 +553,13 @@ var CloudCommander, Util,
|
|||
var lParam = pParams_a.pop();
|
||||
|
||||
if(lParam){
|
||||
done.push(i);
|
||||
lDone.push(i);
|
||||
|
||||
if(Util.isString(lParam) )
|
||||
lParam = { src : lParam };
|
||||
|
||||
var lFunc = lParam.func;
|
||||
lParam.func = Util.retExec(doneFunc, lFunc);
|
||||
lParam.func = Util.retExec(lDoneFunc, lFunc);
|
||||
|
||||
DOM.anyload(lParam);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -372,45 +372,57 @@ var CloudFunc, exports, Util;
|
|||
}
|
||||
|
||||
for(var i = 1, n = files.length; i < n; i++){
|
||||
var lFile = files[i];
|
||||
var lFile = files[i],
|
||||
lOwner = !lFile.uid ? 'root' : lFile.uid,
|
||||
lMode = CloudFunc.getSymbolicPermissions(lFile.mode),
|
||||
lType, lSize;
|
||||
|
||||
if(lFile.size === 'dir'){
|
||||
lType = 'directory',
|
||||
lSize = '<dir>';
|
||||
}else{
|
||||
lType = 'text-file';
|
||||
lSize = CloudFunc.getShortSize( lFile.size );
|
||||
}
|
||||
|
||||
lFileTable += '<li draggable class>';
|
||||
lFileTable += '<span draggable class="mini-icon ';
|
||||
|
||||
/* если папка - выводим другую иконку */
|
||||
lFileTable += (lFile.size==='dir'?
|
||||
'directory':'text-file') +
|
||||
'">';
|
||||
lFileTable += '</span>';
|
||||
lFileTable += '<span draggable class=name>' +
|
||||
'<a href="' + FS + lPath + files[i].name +
|
||||
'"' +
|
||||
/* открываем файлы */
|
||||
/*в новой вкладке */
|
||||
(lFile.size === 'dir' ?
|
||||
'' : ' target="_blank"') +
|
||||
|
||||
' title="' + lFile.name +'"' +
|
||||
' draggable=true>' + lFile.name +
|
||||
"</a>" +
|
||||
'</span>';
|
||||
/* если папка - не выводим размер */
|
||||
lFileTable += '<span draggable class=size>' +
|
||||
(lFile.size === 'dir' ?
|
||||
'<dir>'
|
||||
/* если это файл - получаем
|
||||
* короткий размер
|
||||
*/
|
||||
: CloudFunc.getShortSize(
|
||||
lFile.size));
|
||||
lFileTable += '</span>' +
|
||||
'<span draggable class=owner>' +
|
||||
(!lFile.uid ? 'root' : lFile.uid) +
|
||||
'</span>' +
|
||||
'<span draggable class=mode>' +
|
||||
CloudFunc.getSymbolicPermissions(lFile.mode)+
|
||||
if(pTemplate)
|
||||
lFileTable += Util.render(pTemplate,{
|
||||
type : lType,
|
||||
link : FS + lPath + lFile.name,
|
||||
name : lFile.name,
|
||||
size : '<dir>',
|
||||
owner : lOwner,
|
||||
mode : lMode
|
||||
});
|
||||
else
|
||||
{
|
||||
lFileTable += '<li draggable class>';
|
||||
lFileTable += '<span draggable class="mini-icon ';
|
||||
|
||||
/* если папка - выводим другую иконку */
|
||||
lFileTable += lType + '">' +
|
||||
'</span>' +
|
||||
'<span draggable class=name>' +
|
||||
'<a href="' + FS + lPath + lFile.name +
|
||||
'"' +
|
||||
/* открываем файлы */
|
||||
/*в новой вкладке */
|
||||
(lFile.size === 'dir' ?
|
||||
'' : ' target="_blank"') +
|
||||
|
||||
' title="' + lFile.name +'"' +
|
||||
' draggable=true>' + lFile.name +
|
||||
"</a>" +
|
||||
'</span>';
|
||||
lFileTable += '</li>';
|
||||
/* если папка - не выводим размер */
|
||||
lFileTable += '<span draggable class=size>' + lSize +
|
||||
'</span>' +
|
||||
'<span draggable class=owner>' + lOwner +
|
||||
'</span>' +
|
||||
'<span draggable class=mode>' + lMode +
|
||||
'</span>';
|
||||
lFileTable += '</li>';
|
||||
}
|
||||
}
|
||||
|
||||
return lFileTable;
|
||||
|
|
|
|||
|
|
@ -31,13 +31,13 @@ Util = exports || {};
|
|||
* @param pParams
|
||||
*/
|
||||
Util.call = function(pFunc, pParams){
|
||||
var lFunc = function(pError, pData){
|
||||
function lFunc(pError, pData){
|
||||
Util.exec(pFunc, {
|
||||
error : pError,
|
||||
data : pData,
|
||||
params : pParams
|
||||
});
|
||||
};
|
||||
}
|
||||
|
||||
return lFunc;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue