diff --git a/html/index.html b/html/index.html index 58e47df7..c775c8b1 100644 --- a/html/index.html +++ b/html/index.html @@ -21,7 +21,7 @@ - + diff --git a/lib/client.js b/lib/client.js index 974b5c69..cc74fead 100644 --- a/lib/client.js +++ b/lib/client.js @@ -285,7 +285,7 @@ function initKeysPanel(pCallBack){ null, /* f5 */ null, /* f6 */ null, /* f7 */ - DOM.promptRemoveCurrent,/* f8 */ + DOM.promptDeleteCurrent,/* f8 */ ]; for(var i = 1; i <= 8; i++){ diff --git a/lib/client/dom.js b/lib/client/dom.js index 20cd2396..466e2286 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -360,7 +360,7 @@ var CloudCommander, Util, * * @pCurrentFile */ - DOM.promptRemoveCurrent = function(pCurrentFile){ + DOM.promptDeleteCurrent = function(pCurrentFile){ var lRet, lCurrent, lName, @@ -375,7 +375,7 @@ var CloudCommander, Util, lRet = confirm(lMsg + lName + '?'); if(lRet) - DOM.removeCurrent(lCurrent); + DOM.deleteCurrent(lCurrent); return lRet; }; @@ -1215,7 +1215,7 @@ var CloudCommander, Util, * remove current file from file table * @pCurrent */ - DOM.removeCurrent = function(pCurrent){ + DOM.deleteCurrent = function(pCurrent){ var lCurrent = pCurrent || DOM.getCurrentFile(), lParent = lCurrent.parentElement, lName = DOM.getCurrentName(lCurrent); diff --git a/lib/client/keyBinding.js b/lib/client/keyBinding.js index df348264..fdcf2d0c 100644 --- a/lib/client/keyBinding.js +++ b/lib/client/keyBinding.js @@ -115,7 +115,7 @@ var CloudCommander, Util, DOM; DOM.preventDefault(pEvent);//запрет на дальнейшее действие } else if(lKeyCode === KEY.Delete) - DOM.promptRemoveCurrent(lCurrentFile); + DOM.promptDeleteCurrent(lCurrentFile); /* if f3 or shift+f3 or alt+f3 pressed */ else if(lKeyCode === KEY.F3){ diff --git a/lib/client/menu.js b/lib/client/menu.js index 5e8de2c5..e331db0e 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -160,7 +160,7 @@ var CloudCommander, Util, DOM, $; lMenuItems = { 'View' : Util.retExec(showEditor, true), 'Edit' : Util.retExec(showEditor, false), - 'Delete' : Util.retExec(DOM.promptRemoveCurrent), + 'Delete' : Util.retExec(DOM.promptDeleteCurrent), }; if(UploadToItemNames.length)