refactor(client) rm custom listeners

This commit is contained in:
coderaiser 2014-01-08 13:53:14 +00:00
parent 82f432b06f
commit 98a3bcd171
10 changed files with 40 additions and 136 deletions

View file

@ -104,7 +104,7 @@
if (!isContain)
lPath += '.js';
if (!CloudCmd[lName])
if (!CloudCmd[lName]) {
CloudCmd[lName] = function(pArg) {
var path = CloudCmd.LIBDIRCLIENT + lPath;
@ -118,6 +118,9 @@
CloudCmd[lName] = new Proto(pArg);
});
};
CloudCmd[lName].show = CloudCmd[lName];
}
}
}

View file

@ -26,9 +26,6 @@ var CloudCmd, Util, DOM;
},
CloudCmd.View,
]);
DOM.Events.addKey(listener);
DOM.setButtonKey('f10', Config.show);
}
this.show = function() {
@ -99,15 +96,6 @@ var CloudCmd, Util, DOM;
CloudCmd.View.hide();
};
function listener(pEvent){
var f10 = Key.F10,
isBind = Key.isBind(),
key = pEvent.keyCode;
/* если клавиши можно обрабатывать */
if (isBind && key === f10)
Config.show();
}
function changeConfig(config) {
var name;

View file

@ -30,9 +30,6 @@ var CloudCmd, Util, DOM, CloudFunc, $;
DOM.jqueryLoad,
DOM.socketLoad
]);
DOM.Events.addKey(listener);
DOM.setButtonKey('~', Console.show);
}
this.show = function() {
@ -98,10 +95,6 @@ var CloudCmd, Util, DOM, CloudFunc, $;
}
};
this.hide = function() {
CloudCmd.View.hide();
};
this.log = function(pText) {
log(pText, 'log');
};
@ -147,26 +140,6 @@ var CloudCmd, Util, DOM, CloudFunc, $;
});
}
function listener(pEvent) {
var lTRA = Key.TRA,
lESC = Key.ESC,
lIsBind = Key.isBind(),
lKey = pEvent.keyCode;
switch(lKey) {
case lTRA:
if (lIsBind) {
Console.show();
DOM.preventDefault(pEvent);
}
break;
case lESC:
Console.hide();
break;
}
}
init();
}

View file

@ -1188,14 +1188,6 @@ var CloudCmd, Util, DOM, CloudFunc, Dialog;
return lRet;
};
/**
* set onclick handler on buttons f1-f10
* @param pKey - 'f1'-'f10'
*/
this.setButtonKey = function(pKey, pFunc) {
Events.addClick(pFunc, CloudCmd.KeysPanel[pKey]);
};
/**
* set title with pName
* create title element

View file

@ -29,9 +29,6 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch;
load,
CloudCmd.View
]);
DOM.Events.addKey(listener);
DOM.setButtonKey('f4', Edit.show);
}
this.show = function(pValue) {
@ -246,17 +243,7 @@ var CloudCmd, Util, DOM, CloudFunc, ace, DiffProto, diff_match_patch;
});
}
function listener(pEvent) {
var lF4, lKey, lIsBind = Key.isBind();
if (lIsBind) {
lF4 = Key.F4,
lKey = pEvent.keyCode;
if(lKey === lF4)
Edit.show();
}
}
function onSave(text) {
var ret,

View file

@ -14,9 +14,6 @@ var CloudCmd, Util, DOM;
Help.show,
CloudCmd.View,
]);
DOM.Events.addKey(listener);
DOM.setButtonKey('f1', Help.show);
}
this.show = function() {
@ -66,16 +63,6 @@ var CloudCmd, Util, DOM;
CloudCmd.View.hide();
};
function listener(pEvent) {
var lF1 = Key.F1,
lIsBind = Key.isBind(),
lKey = pEvent.keyCode;
/* если клавиши можно обрабатывать */
if (lIsBind && lKey === lF1)
Help.show();
}
init();
}

View file

@ -208,7 +208,7 @@ var CloudCmd, Util, DOM;
break;
case Key.F1:
Util.exec(CloudCmd.Help);
Util.exec(CloudCmd.Help.show);
DOM.preventDefault(pEvent);
break;
@ -217,12 +217,12 @@ var CloudCmd, Util, DOM;
break;
case Key.F3:
Util.exec(CloudCmd.View);
Util.exec(CloudCmd.View.show);
DOM.preventDefault(pEvent);
break;
case Key.F4:
Util.exec(CloudCmd.Edit);
Util.exec(CloudCmd.Edit.show);
DOM.preventDefault(pEvent);
break;
@ -251,14 +251,15 @@ var CloudCmd, Util, DOM;
break;
case Key.F10:
Util.exec(CloudCmd.Config);
Util.exec(CloudCmd.Config.show);
DOM.preventDefault(pEvent);
break;
case Key.TRA:
DOM.Images.showLoad({top: true});
Util.exec(CloudCmd.Console);
Util.exec(CloudCmd.Console.show);
DOM.preventDefault(pEvent);
break;

View file

@ -40,29 +40,7 @@ var Util, DOM, CloudCmd;
this.initKeysPanel = function() {
var button, id, func,
keysElement = DOM.getByClass('keyspanel')[0],
keysPanel = {},
onceClickFuncs = {
'f1' : CloudCmd.Help,
'f3' : CloudCmd.View,
'f4' : CloudCmd.Edit,
'f9' : CloudCmd.Menu,
'f10' : CloudCmd.Config,
'~' : CloudCmd.Console,
'contact' : CloudCmd.Contact
};
for (id in onceClickFuncs) {
button = DOM.getById(id);
if (button) {
func = onceClickFuncs[id];
keysPanel[id] = button;
Events.addOnce('click', func, button);
}
}
keysElement = DOM.getByClass('keyspanel')[0];
if (keysElement)
Events.addClick(function(event) {
@ -70,6 +48,14 @@ var Util, DOM, CloudCmd;
id = element.id,
clickFuncs = {
'f1' : CloudCmd.Help.show,
'f3' : CloudCmd.View.show,
'f4' : CloudCmd.Edit.show,
'f9' : CloudCmd.Menu.show,
'f10' : CloudCmd.Config.show,
'~' : CloudCmd.Console.show,
'contact' : CloudCmd.Contact.show,
'f2' : DOM.renameCurrent,
'f5' : DOM.copyCurrent,
'f6' : DOM.moveCurrent,
@ -82,8 +68,6 @@ var Util, DOM, CloudCmd;
Util.exec(func);
}, keysElement);
return keysPanel;
};
/**

View file

@ -34,12 +34,6 @@ var CloudCmd, Util, DOM, CloudFunc, $;
]);
Events.addKey( lListener );
DOM.setButtonKey('f9', function() {
var lCurrent = Info.element;
Events.dispatch('contextmenu', lCurrent);
});
}
this.show = function() {
@ -277,7 +271,8 @@ var CloudCmd, Util, DOM, CloudFunc, $;
*/
function clickProcessing() {
var lLayer = DOM.getById('context-menu-layer');
if (lLayer) {
if (lLayer && Position) {
DOM.hide(lLayer);
var lElement = document.elementFromPoint(Position.x, Position.y),
@ -318,21 +313,18 @@ var CloudCmd, Util, DOM, CloudFunc, $;
}
function lListener(pEvent) {
var lCurrent,
lF9 = Key.F9,
lESC = Key.ESC,
lKey = pEvent.keyCode,
lIsBind = Key.isBind();
var lCurrent,
lF9 = Key.F9,
lKey = pEvent.keyCode,
lIsBind = Key.isBind();
if (lIsBind && lKey === lF9) {
lCurrent = DOM.getCurrentFile();
$(lCurrent).contextmenu();
if (lIsBind && lKey === lF9) {
lCurrent = DOM.getCurrentFile();
$(lCurrent).contextmenu();
DOM.preventDefault(pEvent);
}
else if (lKey === lESC)
Key.setBind();
DOM.preventDefault(pEvent);
}
}
init();
}

View file

@ -8,6 +8,7 @@ var CloudCmd, Util, DOM, CloudFunc, $;
function ViewProto(CallBack) {
var Name = 'View',
Loading = false,
Events = DOM.Events,
Info = DOM.CurrentInfo,
Key = CloudCmd.Key,
Images = DOM.Images,
@ -67,8 +68,7 @@ var CloudCmd, Util, DOM, CloudFunc, $;
DOM.jqueryLoad
]);
DOM.Events.addKey(listener);
DOM.setButtonKey('f3', view);
Events.addKey(listener);
}
/**
@ -161,18 +161,15 @@ var CloudCmd, Util, DOM, CloudFunc, $;
View.show();
}
function listener(pEvent) {
var lF3 = Key.F3,
lIsBind = Key.isBind(),
lKey = pEvent.keyCode;
function listener(event) {
var keyCode = event.keyCode,
ESC = Key.ESC;
/* если клавиши можно обрабатывать */
if (lIsBind && lKey === lF3) {
view();
DOM.preventDefault(pEvent);
}
if (keyCode === ESC)
hide();
}
init();
return View;