mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-07-28 18:23:35 +00:00
minor changes
This commit is contained in:
parent
c671ea973b
commit
ad87f4ff6b
6 changed files with 119 additions and 98 deletions
|
|
@ -89,7 +89,7 @@ var CloudCommander, Util, DOM;
|
|||
else if(lKeyCode === KEY.TAB){
|
||||
console.log('Tab pressed');
|
||||
|
||||
var lResult = Util.tryCatch(function(){
|
||||
Util.tryCatchLog(function(){
|
||||
/* changing parent panel of curent-file */
|
||||
var lPanel = DOM.getPanel(),
|
||||
lId = lPanel.id;
|
||||
|
|
@ -108,9 +108,6 @@ var CloudCommander, Util, DOM;
|
|||
}
|
||||
});
|
||||
|
||||
if(lResult)
|
||||
console.log(lResult);
|
||||
|
||||
event.preventDefault();//запрет на дальнейшее действие
|
||||
}
|
||||
/* if f2 pressed */
|
||||
|
|
@ -237,24 +234,26 @@ var CloudCommander, Util, DOM;
|
|||
/* если нажали клавишу page up
|
||||
* проматываем экран
|
||||
*/
|
||||
else if(lKeyCode === KEY.PAGE_UP){
|
||||
DOM.getPanel().scrollByPages(-1);
|
||||
else if(lKeyCode === KEY.PAGE_UP){
|
||||
DOM.getPanel().scrollByPages(-1);
|
||||
|
||||
for(i=0; i<30; i++){
|
||||
if(!lCurrentFile.previousSibling) break;
|
||||
else try{
|
||||
lCurrentFile
|
||||
.previousSibling
|
||||
var lC = lCurrentFile,
|
||||
tryCatch = function(pCurrentFile){
|
||||
Util.tryCatch(function(){
|
||||
pCurrentFile
|
||||
.previousSibling
|
||||
.previousSibling
|
||||
.previousSibling;
|
||||
}
|
||||
catch(pError){
|
||||
break;
|
||||
}
|
||||
lCurrentFile = lCurrentFile.previousSibling;
|
||||
.previousSibling
|
||||
.previousSibling;
|
||||
});
|
||||
};
|
||||
|
||||
for(i=0; i<30; i++){
|
||||
if(!lC.previousSibling || tryCatch(lC) ) break;
|
||||
|
||||
lC = lC.previousSibling;
|
||||
}
|
||||
DOM.setCurrentFile(lCurrentFile);
|
||||
DOM.setCurrentFile(lC);
|
||||
|
||||
event.preventDefault();//запрет на дальнейшее действие
|
||||
}
|
||||
|
|
@ -318,10 +317,8 @@ var CloudCommander, Util, DOM;
|
|||
* ссылку, на которую повешен eventHandler
|
||||
* onclick
|
||||
*/
|
||||
lRefreshIcon.onclick();
|
||||
|
||||
lRefreshIcon.onclick();
|
||||
cloudcmd._currentToParent(lSelectedName);
|
||||
|
||||
event.preventDefault();//запрет на дальнейшее действие
|
||||
}
|
||||
}
|
||||
|
|
@ -363,17 +360,16 @@ var CloudCommander, Util, DOM;
|
|||
* устанавливаем все обработчики
|
||||
* нажатий клавиш
|
||||
*/
|
||||
else if(lKeyCode === KEY.S &&
|
||||
event.altKey){
|
||||
/* обрабатываем нажатия на клавиши*/
|
||||
keyBinded = true;
|
||||
|
||||
console.log('<alt>+s pressed');
|
||||
console.log('<ctrl>+r reload key-handerl - set');
|
||||
console.log('<ctrl>+s clear cache key-handler - set');
|
||||
console.log('press <alt>+q to remove them');
|
||||
|
||||
event.preventDefault();//запрет на дальнейшее действие
|
||||
else if(event.keyCode === KEY.S && event.altKey){
|
||||
/* обрабатываем нажатия на клавиши*/
|
||||
keyBinded = true;
|
||||
|
||||
console.log('<alt>+s pressed');
|
||||
console.log('<ctrl>+r reload key-handerl - set');
|
||||
console.log('<ctrl>+s clear cache key-handler - set');
|
||||
console.log('press <alt>+q to remove them');
|
||||
|
||||
event.preventDefault();//запрет на дальнейшее действие
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* object contains jQuery-contextMenu
|
||||
* https://github.com/medialize/jQuery-contextMenu
|
||||
*/
|
||||
var CloudCommander, Util, DOM, $;
|
||||
var CloudCommander, Util, DOM, CloudFunc, $;
|
||||
(function(){
|
||||
"use strict";
|
||||
|
||||
|
|
@ -203,8 +203,7 @@ var CloudCommander, Util, DOM, $;
|
|||
|
||||
var lFunc = document.oncontextmenu;
|
||||
document.oncontextmenu = function(){
|
||||
if(typeof lFunc === 'function')
|
||||
lFunc();
|
||||
Util.exec(lFunc);
|
||||
return Menu.ENABLED;
|
||||
};
|
||||
|
||||
|
|
@ -224,18 +223,13 @@ var CloudCommander, Util, DOM, $;
|
|||
});
|
||||
|
||||
/* добавляем обработчик клавишь */
|
||||
if (document.addEventListener)
|
||||
if (document.addEventListener)
|
||||
document.addEventListener('keydown', key_event.bind(this),false);
|
||||
|
||||
else{
|
||||
lFunc;
|
||||
if(typeof document.onkeydown === 'function')
|
||||
lFunc = document.onkeydown;
|
||||
|
||||
lFunc = document.onkeydown;
|
||||
document.onkeydown = function(){
|
||||
if(lFunc)
|
||||
lFunc();
|
||||
|
||||
Util.exec(lFunc);
|
||||
key_event();
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -21,9 +21,10 @@
|
|||
/* Native Modules*/
|
||||
exports.child_process = require('child_process'),
|
||||
exports.fs = require('fs'),
|
||||
exports.http = require('http'),
|
||||
exports.https = require('https'),
|
||||
exports.path = require('path'),
|
||||
exports.querystring = require('querystring'),
|
||||
exports.path = require('path'),
|
||||
exports.querystring = require('querystring'),
|
||||
|
||||
/* Needed Modules */
|
||||
exports.util = Util = require(LIBDIR + 'util'),
|
||||
|
|
|
|||
50
lib/util.js
50
lib/util.js
|
|
@ -46,6 +46,18 @@ var Util, exports;
|
|||
pStr1.indexOf(pStr2) >= 0;
|
||||
};
|
||||
|
||||
/**
|
||||
* function log pArg if it's not empty
|
||||
* @param pArg
|
||||
*/
|
||||
Util.log = function(pArg){
|
||||
var lRet = pArg;
|
||||
if(pArg)
|
||||
console.log(pArg);
|
||||
|
||||
return lRet;
|
||||
};
|
||||
|
||||
/**
|
||||
* function remove substring from string
|
||||
* @param pStr
|
||||
|
|
@ -115,14 +127,25 @@ var Util, exports;
|
|||
};
|
||||
};
|
||||
|
||||
Util.ExecOnExec = function(pCallBacks){
|
||||
if(Util.isArray(pCallBacks)){
|
||||
for(var i = 0, n = pCallBacks.length; i < n; i++){
|
||||
var lFunc = pCallBacks.pop();
|
||||
|
||||
Util.execOnExec( Util.retExec(lFunc, pCallBacks) );
|
||||
/**
|
||||
* set value to property of object, if object exist
|
||||
* @param pArgs {object, property, value}
|
||||
*/
|
||||
Util.setValue = function(pArgs){
|
||||
var lRet = false;
|
||||
|
||||
if( Util.isObject(pArgs) ){
|
||||
var lObj = pArgs.object,
|
||||
lProp = pArgs.property,
|
||||
lVal = pArgs.lVal;
|
||||
|
||||
if(lObj){
|
||||
lObj[lProp] = lVal;
|
||||
lRet = true;
|
||||
}
|
||||
}
|
||||
|
||||
return lRet;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -131,7 +154,7 @@ var Util, exports;
|
|||
*
|
||||
* @param pCallBack
|
||||
*/
|
||||
Util.tryCatch = function(pCallBack){
|
||||
Util.tryCatch = function(pCallBack){
|
||||
var lRet;
|
||||
try{
|
||||
lRet = pCallBack();
|
||||
|
|
@ -143,6 +166,19 @@ var Util, exports;
|
|||
return lRet;
|
||||
};
|
||||
|
||||
/**
|
||||
* function execute param function in
|
||||
* try...catch block and log result
|
||||
*
|
||||
* @param pCallBack
|
||||
*/
|
||||
Util.tryCatchLog = function(pCallBack){
|
||||
var lRet;
|
||||
|
||||
lRet = Util.tryCatch(pCallBack);
|
||||
|
||||
return Util.log(lRet);
|
||||
};
|
||||
/**
|
||||
* function do save exec
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue