refactored

This commit is contained in:
coderaiser 2012-11-09 05:53:20 -05:00
parent 3a6edf2fd0
commit 1871c1c482
3 changed files with 34 additions and 50 deletions

View file

@ -52,7 +52,7 @@ var CloudCommander, Util, DOM;
KeyBinding.unSet = function(){keyBinded = false;};
KeyBinding.init = (function(){
KeyBinding.init = function(){
/* saving state of tabs varibles */
var lTabPanel = {
left : 0,
@ -73,37 +73,31 @@ var CloudCommander, Util, DOM;
console.log('openning config window...');
DOM.Images.showLoad({top: true});
if ( Util.isFunction(cloudcmd.Config) )
cloudcmd.Config();
Util.exec(cloudcmd.Config);
}
else if(lKeyCode === KEY.G && event.altKey){
var lStorage = cloudcmd.Storage;
if( Util.isFunction(lStorage) )
lStorage();
}
else if(lKeyCode === KEY.G && event.altKey)
Util.exec(cloudcmd.Storage);
/* если нажали таб:
* переносим курсор на
* правую панель, если
* мы были на левой и
* наоборот
*/
*/
else if(lKeyCode === KEY.TAB){
console.log('Tab pressed');
try{
var lResult = Util.tryCatch(function(){
/* changing parent panel of curent-file */
var lPanel = DOM.getPanel();
var lId = lPanel.id;
var lPanel = DOM.getPanel(),
lId = lPanel.id;
lTabPanel[lId] = lCurrentFile;
lPanel = DOM.getPanel({active:false});
lId = lPanel.id;
if(lTabPanel[lId])
DOM.setCurrentFile(lTabPanel[lId]);
@ -112,8 +106,10 @@ var CloudCommander, Util, DOM;
DOM.setCurrentFile(lFirstFileOnList);
}
}catch(error){console.log(error);}
});
if(lResult)
console.log(lResult);
event.preventDefault();//запрет на дальнейшее действие
}
@ -121,22 +117,17 @@ var CloudCommander, Util, DOM;
else if(lKeyCode === KEY.F2){
}
else if(lKeyCode === KEY.Delete)
else if(lKeyCode === KEY.Delete)
DOM.removeCurrent(lCurrentFile);
/* if f3 or shift+f3 or alt+f3 pressed */
else if(lKeyCode === KEY.F3){
DOM.Images.showLoad();
var lViewer = cloudcmd.Viewer;
var lEditor = cloudcmd.Editor;
if(event.shiftKey && Util.isFunction(lViewer) )
lViewer();
else if ( Util.isFunction(lEditor) )
lEditor(true);
var lEditor = cloudcmd[event.shiftKey ?
'Viewer' : 'Editor'];
Util.exec(lEditor, true);
event.preventDefault();//запрет на дальнейшее действие
}
@ -144,23 +135,19 @@ var CloudCommander, Util, DOM;
else if(lKeyCode === KEY.F4) {
DOM.Images.showLoad();
if ( Util.isFunction(cloudcmd.Editor) )
cloudcmd.Editor();
Util.exec(cloudcmd.Editor);
event.preventDefault();//запрет на дальнейшее действие
}
else if(lKeyCode === KEY.F10 &&
event.shiftKey){
if ( Util.isFunction(cloudcmd.Menu) )
cloudcmd.Menu();
event.preventDefault();//запрет на дальнейшее действие
else if(lKeyCode === KEY.F10 && event.shiftKey){
Util.exec(cloudcmd.Menu);
event.preventDefault();//запрет на дальнейшее действие
}
else if (lKeyCode === KEY.TRA){
DOM.Images.showLoad({top: true});
if( Util.isFunction(cloudcmd.Terminal) )
cloudcmd.Terminal();
Util.exec(cloudcmd.Terminal);
}
/* навигация по таблице файлов*/
/* если нажали клавишу вверх*/
@ -399,5 +386,5 @@ var CloudCommander, Util, DOM;
/* клавиши назначены*/
keyBinded = true;
});
};
})();

View file

@ -23,7 +23,8 @@ var CloudCommander, Util, DOM, $;
*/
function showEditor(pReadOnly){
DOM.Images.showLoad();
var lEditor = pReadOnly ? cloudcmd.Viewer : cloudcmd.Editor,
var lEditor = cloudcmd[pReadOnly ? 'Viewer' : 'Editor'],
lResult = Util.exec(lEditor, pReadOnly);
if(!lResult){

View file

@ -10,10 +10,9 @@ var CloudCommander, DOM, $;
TerminalId,
Term,
Hidden = false;
JqueryTerminal = {};
cloudcmd.Terminal = {};
var JqueryTerminal = {};
cloudcmd.Terminal = {};
/* PRIVATE FUNCTIONS */
@ -81,11 +80,9 @@ var CloudCommander, DOM, $;
* functin show jquery-terminal
*/
JqueryTerminal.show = function(){
DOM.Images.hideLoad();
DOM.Images.hideLoad();
/* only if panel was hided */
var lHided = DOM.hidePanel();
if(lHided){
if( DOM.hidePanel() ){
Hidden = false;
DOM.show(TerminalId);
@ -139,6 +136,5 @@ var CloudCommander, DOM, $;
document.onkeypress = key_event;
};
cloudcmd.Terminal.JqueryTerminal = JqueryTerminal;
})();
cloudcmd.Terminal.JqueryTerminal = JqueryTerminal;
})();