Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-18 08:56:20 +00:00
Code Issues Projects Releases Wiki Activity

refactored

Browse source
This commit is contained in:
coderaiser 2013-01-25 07:09:46 -05:00
parent 594a0e92cc
commit df16cf02dc
2 changed files with 15 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/client/dom.js
View file

@ -850,8 +850,8 @@ var CloudCommander, Util,
*
* @pCurrentFile
*/
DOM.getCurrentFile = function(){
var lRet = DOM.getByClass(CURRENT_FILE )[0];
DOM.getCurrentFile = function(pCurrentFile){
var lRet = pCurrentFile || DOM.getByClass(CURRENT_FILE )[0];
return lRet;
};
@ -859,7 +859,7 @@ var CloudCommander, Util,
DOM.getCurrentSize = function(pCurrentFile){
var lRet,
lCurrent = pCurrentFile || DOM.getCurrentFile(),
lCurrent = DOM.getCurrentFile(pCurrentFile),
lSize = DOM.getByClass('size', lCurrent);
lRet = lSize[0].textContent;
@ -955,13 +955,10 @@ var CloudCommander, Util,
* unified way to set current file
*/
DOM.setCurrentFile = function(pCurrentFile){
var lRet = true,
var lRet,
lCurrentFileWas = DOM.getCurrentFile();
if(!pCurrentFile)
lRet = false;
if(lRet){
if(pCurrentFile){
if (pCurrentFile.className === 'path')
pCurrentFile = pCurrentFile.nextSibling;
@ -975,6 +972,8 @@ var CloudCommander, Util,
/* scrolling to current file */
DOM.scrollIntoViewIfNeeded(pCurrentFile);
lRet = true;
}
return lRet;
};
@ -1041,8 +1040,7 @@ var CloudCommander, Util,
* @param pCurrentFile - current file by default
*/
DOM.getCurrentLink = function(pCurrentFile){
var lLink = DOM.getByTag('a',
pCurrentFile || DOM.getCurrentFile()),
var lLink = DOM.getByTag( 'a', DOM.getCurrentFile(pCurrentFile) ),
lRet = lLink.length > 0 ? lLink[0] : -1;
@ -1055,8 +1053,8 @@ var CloudCommander, Util,
* @param pCurrentFile - current file by default
*/
DOM.getCurrentPath = function(pCurrentFile){
var lCurrent = pCurrentFile || DOM.getCurrentFile(),
lPath = DOM.getCurrentLink(lCurrent).href;
var lCurrent = DOM.getCurrentFile( pCurrentFile ),
lPath = DOM.getCurrentLink( lCurrent ).href;
/* убираем адрес хоста*/
lPath = Util.removeStr(lPath, CloudCommander.HOST);
lPath = Util.removeStr(lPath, CloudFunc.NOJS);
@ -1070,8 +1068,8 @@ var CloudCommander, Util,
* @param pCurrentFile
*/
DOM.getCurrentName = function(pCurrentFile){
var lLink = DOM.getCurrentLink(
pCurrentFile || DOM.getCurrentFile());
var lCurrent = DOM.getCurrentFile( pCurrentFile ),
lLink = DOM.getCurrentLink( lCurrent );
if(lLink)
lLink = lLink.textContent;
@ -1089,7 +1087,7 @@ var CloudCommander, Util,
/** function getting panel active, or passive
* @param pPanel_o = {active: true}
*/
DOM.getPanel = function(pActive){
DOM.getPanel = function(pActive){
var lPanel = DOM.getCurrentFile().parentElement;
/* if {active : false} getting passive panel */

7
lib/client/menu.js
View file

@ -305,11 +305,8 @@ var CloudCommander, Util, DOM, $;
if( KeyBinding.get() ){
/* if shift + F10 pressed */
if(lKeyCode === lKEY.F10 && pEvent.shiftKey){
var lCurrent = DOM.getCurrentFile();
if(lCurrent)
$(lCurrent).contextMenu();
pEvent.preventDefault();
$( DOM.getCurrentFile() ).contextMenu();
DOM.preventDefault(pEvent);
}
}
else if (lKeyCode === lKEY.ESC)