diff --git a/lib/client.js b/lib/client.js index 49fa380c..18e9edc0 100644 --- a/lib/client.js +++ b/lib/client.js @@ -528,7 +528,6 @@ CloudCmd._ajaxLoad = function(pPath, pOptions){ pOptions = {}; /* Отображаем красивые пути */ - var lFSPath = decodeURI(pPath), lNOJSPath = Util.removeStr( lFSPath, '?json' ), lCleanPath = Util.removeStr( lNOJSPath, CloudFunc.FS ) || '/', diff --git a/lib/client/dom.js b/lib/client/dom.js index b9f67c00..8177a429 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -1275,14 +1275,16 @@ var CloudCommander, Util, lParent = lCurrent.parentElement, lName = DOM.getCurrentName(lCurrent), lUrl = DOM.getCurrentPath(lCurrent); - + if( DOM.isCurrentIsDir(lCurrent) ) lUrl += '?dir'; if(lCurrent && lParent && lName !== '..'){ DOM.Images.showLoad(); CloudCommander.getConfig(function(pConfig){ - lUrl = pConfig && pConfig.api_url + lUrl; + lUrl = decodeURI(lUrl); + lUrl = pConfig && pConfig.api_url + lUrl; + DOM.ajax({ method : 'DELETE', url : lUrl, diff --git a/lib/server/rest.js b/lib/server/rest.js index 6b66b1be..bb82f131 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -108,7 +108,7 @@ var p = pParams, lQuery = main.getQuery(p.request); - p.name = Util.removeStr(pParams.name, [CloudFunc.FS, '?dir']) || '/'; + p.name = Util.removeStr(p.name, [CloudFunc.FS, '?dir']) || '/'; switch(p.method){ case 'GET': fs.stat(p.name, function(pError, pStat){