From 79b738e607919f4785ce8df6f9a2c2e649ca6c1e Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 10 Apr 2013 05:11:44 -0400 Subject: [PATCH] fixed bug with processing selected root directory --- ChangeLog | 4 +++- lib/client/dom.js | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43228773..30ce81a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,7 +69,9 @@ is pressed and current file is directory. * Added ability to delete file when f8 key pressed. -* Fixed bug with selectecting root directory with space +* Fixed bug with selectecting root directory with space. + +* Fixed bug with processing selected root directory. 2012.03.01, Version 0.1.9 diff --git a/lib/client/dom.js b/lib/client/dom.js index 10c0a04f..452a007b 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -439,24 +439,19 @@ var CloudCommander, Util, DOM = {}, CloudFunc; */ DOM.promptDeleteCurrent = function(pCurrentFile){ var lRet, - lCurrent, - lQuery, - lName, - lMsg, + lCurrent, lQuery, lName, lMsg, lMsgAsk = 'Do you really want to delete the ', lMsgSel = 'selected ', lSelected = DOM.getSelectedFiles(), i, n = lSelected && lSelected.length; if(n > 1){ - lQuery = '?files'; - lName = n > 1 ? 'files:\n' : ''; - for(i = 0; i < 4 && i < n; i++) lName += DOM.getCurrentName( lSelected[i] ) + '\n'; lName += '...'; lMsg = lMsgAsk + lMsgSel + n + ' files/directoris?\n\n'; + lQuery = '?files'; }else{ var lType, lIsDir; @@ -1352,10 +1347,16 @@ var CloudCommander, Util, DOM = {}, CloudFunc; var lSelected = pSelected || DOM.getSelectedFiles(), lRet = lSelected ? [] : null; - if(lRet) - for(var i = 0, n = lSelected.length; i < n;i++) - lRet[i] = DOM.getCurrentName( lSelected[i] ); + for(var i = 0, n = lSelected.length; i < n;i++){ + var lName =DOM.getCurrentName( lSelected[i] ); + + if(lName === '..'){ + DOM.unsetSelectedFile( lSelected[i--] ); + } + else + lRet[i] = lName; + } return lRet; };