Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 18:55:26 +00:00
Code Issues Projects Releases Wiki Activity

feature(commander) change json structure: [path, files] -> {path: "", files: []}

Browse source
This commit is contained in:
coderaiser 2013-12-02 11:04:46 +00:00
parent a3cfc0a7ea
commit c28bae15cc
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/client.js
View file

@ -398,7 +398,7 @@ var Util, DOM, CloudFunc, CloudCmd;
lDir = DOM.getCurrentDirName(),
lName = DOM.getCurrentName(lCurrent),
lWasRefresh_b = lPath[0].textContent === pJSON[0].path,
lWasRefresh_b = lPath[0].textContent === pJSON.path,
lFuncs = [
CloudCmd.getFileTemplate,
CloudCmd.getPathTemplate

6
lib/cloudfunc.js
View file

@ -334,9 +334,9 @@ var Util;
* {name:'имя',size:'размер',mode:'права доступа'}]
*/
this.buildFromJSON = function(pJSON, pTemplate, pPathTemplate) {
var files = pJSON,
var files = pJSON.files,
/* сохраняем путь каталога в котором мы сейчас находимся*/
lPath = files[0].path,
lPath = pJSON.path,
/*
* Строим путь каталога в котором мы находимся
@ -387,7 +387,7 @@ var Util;
});
}
for(var i = 1, n = files.length; i < n; i++) {
for(var i = 0, n = files.length; i < n; i++) {
var lFile = files[i];
lFileTable += Util.render(pTemplate,{

22
lib/server/commander.js
View file

@ -113,7 +113,7 @@
*/
function fillJSON(pParams) {
var name, stat, mode, isDir, size, uid,
p, i, n, file, path, json,
p, i, n, file, path, json, files,
ret = Util.checkObjTrue(pParams, ['files', 'stats', 'path']);
if (ret) {
@ -123,9 +123,11 @@
/* данные о файлах в формате JSON*/
file = {};
path = getDirPath(p.path);
json = [{
path : path
}];
json = {
path : path,
files : []
},
files = json.files;
for (i = 0; i < n; i++ ) {
/* Переводим права доступа в 8-ричную систему */
@ -142,19 +144,18 @@
/* Если папка - выводим пиктограмму папки *
* В противоположном случае - файла */
file = {
'name' : p.files[i],
'name' : name,
'size' : size,
'uid' : uid,
'mode' : mode
};
json.push(file);
files.push(file);
}
json = changeOrder(json);
files = changeOrder(files);
Util.exec(p.callback, null, json);
}
}
@ -163,11 +164,10 @@
files = [],
dirs = [],
current = [],
path = json[0],
sorted = [path];
sorted = [];
n = json.length;
for (i = 1; i < n; i++) {
for (i = 0; i < n; i++) {
current = json[i];
if (current.size === "dir")