From 39ca504ebf5f63ac9950b6e0c57ee88ac9781342 Mon Sep 17 00:00:00 2001
From: coderaiser <mnemonic.enemy@gmail.com>
Date: Wed, 4 Dec 2013 14:54:58 +0000
Subject: [PATCH] feature(html) rm link to cloudfunc

---
 html/file.html   |  6 ++----
 lib/cloudfunc.js | 26 ++++++++++++++++++--------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/html/file.html b/html/file.html
index 3bfe194e..46903b76 100644
--- a/html/file.html
+++ b/html/file.html
@@ -1,8 +1,6 @@
 <li draggable class="{{ className }}">
     <span class="mini-icon {{ type }}"></span>
-    <span class=name>
-        <a href="{{ link }}" title="{{ name }}" target="{{ target }}" draggable=true>{{ name }}</a>
-    </span>
+    <span class=name>{{ name }}</span>
     <span class=size>{{ size }}</span><span class=owner>{{ owner }}</span>
     <span class=mode>{{ mode }}</span>
-</li>
\ No newline at end of file
+</li>
diff --git a/lib/cloudfunc.js b/lib/cloudfunc.js
index 3c8b9d70..b32ecef3 100644
--- a/lib/cloudfunc.js
+++ b/lib/cloudfunc.js
@@ -319,6 +319,8 @@ var Util;
          */
         this.buildFromJSON                 = function(pJSON, pTemplate, pPathTemplate) {
             var lFile, i, n, type, link, target, size, owner, mode,
+                linkTemplate    = '<a href="{{ link }}" title="{{ name }}" target="{{ target }}" draggable=true>{{ name }}</a>',
+                linkResult,
                 files           = pJSON.files,
                 /* сохраняем путь каталога в котором мы сейчас находимся*/
                 lPath           = pJSON.path,
@@ -343,8 +345,6 @@ var Util;
             lFileTable          += Util.render(pTemplate, {
                 className   : 'fm-header',
                 type        : '',
-                link        : '',
-                target      : '',
                 name        : 'name',
                 size        : 'size',
                 owner       : 'owner',
@@ -367,13 +367,17 @@ var Util;
                 
                 lLink = FS + lDotDot;
                 
+                linkResult  = Util.render(linkTemplate, {
+                    link        : lLink,
+                    name        : '..',
+                    target      : ''
+                });
+                
                 /* Сохраняем путь к каталогу верхнего уровня*/
                 lFileTable += Util.render(pTemplate,{
                     className   : '',
                     type        : 'directory',
-                    link        : lLink,
-                    target      : '',
-                    name        : '..',
+                    name        : linkResult,
                     size        : '&lt;dir&gt;',
                     owner       : '.',
                     mode        : ''
@@ -390,14 +394,20 @@ var Util;
                 owner   = !lFile.uid ? 'root' : lFile.uid;
                 mode    = CloudFunc.getSymbolicPermissions(lFile.mode);
                 
+                
+                linkResult  = Util.render(linkTemplate, {
+                    link        : link,
+                    name        : lFile.name,
+                    target      : target
+                });
+                
+                
                 lFileTable += Util.render(pTemplate,{
                     className   : '',
                     /* Если папка - выводим пиктограмму папки   *
                      * В противоположном случае - файла         */
                     type        : type,
-                    link        : link,
-                    target      : target,
-                    name        : lFile.name,
+                    name        : linkResult,
                     size        : size,
                     owner       : owner,
                     mode        : mode