diff --git a/lib/client.js b/lib/client.js index f132b3d1..5fb44638 100644 --- a/lib/client.js +++ b/lib/client.js @@ -41,8 +41,6 @@ var CloudCmd = { _changeLinks : null, /* КОНСТАНТЫ*/ - /* название css-класа текущего файла*/ - CURRENT_FILE : 'current-file', LIBDIR : '/lib/', LIBDIRCLIENT : '/lib/client/', /* height of Cloud Commander @@ -65,7 +63,7 @@ CloudCmd.GoogleAnalytics = function(){ document.onmousemove = function(){ setTimeout(function(){ DOM.jsload(CloudCmd.LIBDIRCLIENT + 'google_analytics.js'); - },5000); + }, 5000); Util.exec(lFunc); diff --git a/lib/client/dom.js b/lib/client/dom.js index 1c54553e..765f5fe2 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -7,32 +7,10 @@ var CloudCommander, Util, /* PRIVATE */ - function getCurrentFileClass(){ - return CloudCommander.CURRENT_FILE; - } - - /** - * private function thet unset currentfile - */ - function unSetCurrentFile(pCurrentFile){ - var lRet_b = DOM.isCurrentFile(pCurrentFile); - - if(!pCurrentFile) - DOM.addCloudStatus({ - code : -1, - msg : 'Error pCurrentFile in' + - 'unSetCurrentFile' + - 'could not be none' - }); - - if(lRet_b) - DOM.removeClass(pCurrentFile, getCurrentFileClass()); - - return lRet_b; - } - /* private members */ - var XMLHTTP, + var /* название css-класа текущего файла*/ + CURRENT_FILE = 'current-file', + XMLHTTP, Title, /* Обьект, который содержит @@ -66,6 +44,26 @@ var CloudCommander, Util, Images = new Images(); + /** + * private function thet unset currentfile + */ + function unSetCurrentFile(pCurrentFile){ + var lRet_b = DOM.isCurrentFile(pCurrentFile); + + if(!pCurrentFile) + DOM.addCloudStatus({ + code : -1, + msg : 'Error pCurrentFile in' + + 'unSetCurrentFile' + + 'could not be none' + }); + + if(lRet_b) + DOM.removeClass(pCurrentFile, CURRENT_FILE); + + return lRet_b; + } + /** * add class to current element * @param pElement @@ -109,7 +107,7 @@ var CloudCommander, Util, * @param pListener * @param pUseCapture */ - DOM.addKeyListener = function(pListener, pUseCapture){ + DOM.addKeyListener = function(pListener, pUseCapture){ return DOM.addListener('keydown', pListener, pUseCapture); }; @@ -750,17 +748,10 @@ var CloudCommander, Util, * * @pCurrentFile */ - DOM.getCurrentFile = function(pCurrentFile){ - var lCurrent = DOM.getByClass( pCurrentFile || getCurrentFileClass() )[0]; - if(!lCurrent){ - DOM.addCloudStatus({ - code : -1, - msg : 'Error: can not find ' + - 'CurrentFile ' + - 'in getCurrentFile' - }); - } - return lCurrent; + DOM.getCurrentFile = function(){ + var lRet = DOM.getByClass(CURRENT_FILE )[0]; + + return lRet; }; @@ -877,7 +868,7 @@ var CloudCommander, Util, if(lCurrentFileWas) unSetCurrentFile(lCurrentFileWas); - DOM.addClass(pCurrentFile, getCurrentFileClass()); + DOM.addClass(pCurrentFile, CURRENT_FILE); /* scrolling to current file */ DOM.scrollIntoViewIfNeeded(pCurrentFile); @@ -934,16 +925,8 @@ var CloudCommander, Util, * @param pCurrentFile */ DOM.isCurrentFile = function(pCurrentFile){ - if(!pCurrentFile) - DOM.addCloudStatus({ - code : -1, - msg : 'Error pCurrentFile in' + - 'isCurrentFile' + - 'could not be none' - }); - var lCurrentFileClass = pCurrentFile.className, - lIsCurrent = lCurrentFileClass.indexOf(getCurrentFileClass()) >= 0; + lIsCurrent = lCurrentFileClass.indexOf(CURRENT_FILE) >= 0; return lIsCurrent; }; @@ -960,13 +943,7 @@ var CloudCommander, Util, lRet = lLink.length > 0 ? lLink[0] : -1; - if(!lRet) - DOM.addCloudStatus({ - code : -1, - msg : 'Error current element do not contain links' - }); - - return lRet; + return lRet; }; /** @@ -993,12 +970,8 @@ var CloudCommander, Util, var lLink = DOM.getCurrentLink( pCurrentFile || DOM.getCurrentFile()); - if(!lLink) - DOM.addCloudStatus({ - code : -1, - msg : 'Error current element do not contain links' - }); - else lLink = lLink.textContent; + if(lLink) + lLink = lLink.textContent; return lLink; };