diff --git a/client.js b/client.js index d21bdac7..f2efb96a 100644 --- a/client.js +++ b/client.js @@ -490,17 +490,17 @@ CloudClient._changeLinks = function(pPanelID){ /* меняем ссылки на ajax-запросы */ var lPanel = getById(pPanelID), a = lPanel.getElementsByTagName('a'), - - /* номер ссылки иконки обновления страницы */ + + /* номер ссылки иконки обновления страницы */ lREFRESHICON = 0, - /* путь в ссылке, который говорит - * что js отключен - */ + /* путь в ссылке, который говорит + * что js отключен + */ lNoJS_s = CloudFunc.NOJS, lFS_s = CloudFunc.FS, - /* right mouse click function varible */ + /* right mouse click function varible */ lOnContextMenu_f = function(pEvent){ var lReturn_b = true; @@ -510,10 +510,10 @@ CloudClient._changeLinks = function(pPanelID){ * currentTarget - DOM event * target - jquery event */ - var lTarget = pEvent.currentTarget || pEvent.target; + var lTarget = pEvent.currentTarget || pEvent.target; DOM.setCurrentFile(lTarget); - if(Util.isFunction(cloudcmd.Menu) ){ + if(Util.isFunction(cloudcmd.Menu) ){ cloudcmd.Menu({ x: pEvent.x, y: pEvent.y diff --git a/lib/client/editor/_codemirror.js b/lib/client/editor/_codemirror.js index 565ae2fd..f4711e1d 100644 --- a/lib/client/editor/_codemirror.js +++ b/lib/client/editor/_codemirror.js @@ -202,11 +202,11 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror; /* если клавиши можно обрабатывать */ if( KeyBinding.get() ){ /* if f4 or f3 pressed */ - var lF3 = cloudcmd.KEY.F3; - var lF4 = cloudcmd.KEY.F4; - var lShow = Util.bind( CodeMirrorEditor.show, CodeMirrorEditor ); + var lF3 = cloudcmd.KEY.F3, + lF4 = cloudcmd.KEY.F4, + lShow = Util.bind( CodeMirrorEditor.show, CodeMirrorEditor ); - if(!pEvent.shiftKey){ + if(!pEvent.shiftKey) switch(pEvent.keyCode) { case lF4: @@ -217,24 +217,18 @@ var CloudCommander, Util, DOM, CloudFunc, CodeMirror; ReadOnly = true; lShow(); break; - } - } + } } }; /* добавляем обработчик клавишь */ - if (document.addEventListener) - document.addEventListener('keydown', key_event, false); + if (document.addEventListener) + document.addEventListener('keydown', key_event, false); else{ - var lFunc; - if( Util.isFunction(document.onkeydown) ) - lFunc = document.onkeydown; - + var lFunc = document.onkeydown; document.onkeydown = function(){ - if(lFunc) - lFunc(); - + Util.exec(lFunc); key_event(); }; } diff --git a/lib/client/menu.js b/lib/client/menu.js index c0808706..25335767 100644 --- a/lib/client/menu.js +++ b/lib/client/menu.js @@ -23,14 +23,13 @@ var CloudCommander, Util, DOM, $; */ function showEditor(pReadOnly){ DOM.Images.showLoad(); - var lEditor = pReadOnly ? cloudcmd.Viewer : cloudcmd.Editor; + var lEditor = pReadOnly ? cloudcmd.Viewer : cloudcmd.Editor, + lResult = Util.exec(lEditor, pReadOnly); - if( Util.isFunction(lEditor) ) - lEditor(pReadOnly); - else{ + if(!lResult){ lEditor = lEditor.get(); - if(lEditor && lEditor.show) - lEditor.show(); + if(lEditor) + Util.exec(lEditor.show); } } diff --git a/lib/client/viewer.js b/lib/client/viewer.js index f04fab10..1cf11556 100644 --- a/lib/client/viewer.js +++ b/lib/client/viewer.js @@ -184,14 +184,12 @@ var CloudCommander, Util, DOM, CloudFunc, $; FancyBox.show = function(pCallBack){ set(); - var lConfig = this.getConfig(); - - if( Util.isFunction(pCallBack) ) - pCallBack(); - else{ - var lCurrentFile = DOM.getCurrentFile(); + var lConfig = this.getConfig(), + lResult = Util.exec(pCallBack); + if(!lResult){ + var lCurrentFile = DOM.getCurrentFile(), + lA = DOM.getByClass('fancybox', lCurrentFile)[0]; - var lA = DOM.getByClass('fancybox', lCurrentFile)[0]; if(lA){ if(lA.rel) $.fancybox.open({ href : lA.href },