From 1468c0459378d1ce158684898839a6f9633f7e9e Mon Sep 17 00:00:00 2001 From: coderaiser Date: Sat, 24 May 2014 12:38:27 -0400 Subject: [PATCH] feature(cloudfunc) buildFromJSON: add data-name --- lib/client/dom.js | 12 ++++++------ lib/cloudfunc.js | 11 ++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/lib/client/dom.js b/lib/client/dom.js index 8ee5070b..4fe15974 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -862,13 +862,13 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog; * get current file by name */ this.getCurrentFileByName = function(name) { - var ret, panel; + var element, + panel = DOM.getPanel(); + + name = 'js-file-' + name; + element = DOM.getByDataName(name, panel); - panel = DOM.getPanel(); - name = name + '(' + panel.id + ')'; - ret = DOM.getById(name); - - return ret; + return element; }; /** diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js index 53e998dd..b3acdcf1 100644 --- a/lib/cloudfunc.js +++ b/lib/cloudfunc.js @@ -369,7 +369,7 @@ var Util; this.buildFromJSON = function(params) { var file, i, n, type, attribute, size, owner, mode, /* ссылка на верхний каталог*/ - dotDot, link, + dotDot, link, dataName, linkResult, template = params.template, templateFile = template.file, @@ -430,10 +430,12 @@ var Util; name : '..' }); + dataName = 'data-name="js-file-.."', + attribute = 'draggable="true"' + dataName, /* Сохраняем путь к каталогу верхнего уровня*/ fileTable += Util.render(template.file, { tag : 'li', - attribute : 'draggable="true" ', + attribute : attribute, className : '', type : 'directory', name : linkResult, @@ -467,9 +469,12 @@ var Util; attribute : attribute }); + dataName = 'data-name="js-file-' + file.name + '" '; + attribute = 'draggable="true" ' + dataName; + fileTable += Util.render(templateFile, { tag : 'li', - attribute : 'draggable="true" ', + attribute : attribute, className : '', /* Если папка - выводим пиктограмму папки * * В противоположном случае - файла */