mirror of
https://github.com/coderaiser/cloudcmd.git
synced 2026-01-23 10:45:47 +00:00
fixed bug with `-char, wich showed on tugle between fs-panel and terminal
This commit is contained in:
parent
ab14f851fd
commit
71caba83ae
3 changed files with 46 additions and 33 deletions
|
|
@ -9,6 +9,7 @@ var CloudCommander, $;
|
|||
Util = cloudcmd.Util,
|
||||
KeyBinding = cloudcmd.KeyBinding,
|
||||
TerminalId,
|
||||
Term,
|
||||
Hidden = false;
|
||||
|
||||
cloudcmd.Terminal = {};
|
||||
|
|
@ -27,6 +28,18 @@ var CloudCommander, $;
|
|||
Util.jsload('lib/client/terminal/jquery-terminal/jquery.terminal.js',
|
||||
function(){
|
||||
JqueryTerminal.init();
|
||||
|
||||
$(function($, undefined) {
|
||||
Term = JqueryTerminal.Term = $('#terminal').terminal(function(command, term){
|
||||
term.echo('');
|
||||
cloudcmd.Socket.send(command);
|
||||
}, {
|
||||
greetings : 'Javascript Interpreter',
|
||||
prompt : 'cloudcmd> '
|
||||
});
|
||||
});
|
||||
|
||||
Util.Images.hideLoad();
|
||||
JqueryTerminal.show();
|
||||
});
|
||||
};
|
||||
|
|
@ -50,22 +63,29 @@ var CloudCommander, $;
|
|||
else
|
||||
console.log('Error. Something went wrong FM not found');
|
||||
});
|
||||
|
||||
JqueryTerminal.show = function(){
|
||||
Util.Images.hideLoad();
|
||||
|
||||
JqueryTerminal.show = (function(){
|
||||
Hidden = false;
|
||||
|
||||
Util.hidePanel();
|
||||
Util.show(TerminalId);
|
||||
|
||||
KeyBinding.unSet();
|
||||
|
||||
$(function($, undefined) {
|
||||
JqueryTerminal.Term = $('#terminal').terminal(function(command, term){
|
||||
term.echo('');
|
||||
cloudcmd.Socket.send(command);
|
||||
}, {
|
||||
greetings : 'Javascript Interpreter',
|
||||
prompt : 'cloudcmd> '
|
||||
});
|
||||
});
|
||||
};
|
||||
Term.resume();
|
||||
});
|
||||
|
||||
JqueryTerminal.hide = (function(){
|
||||
Hidden = true;
|
||||
|
||||
Util.hide(TerminalId);
|
||||
Util.showPanel();
|
||||
|
||||
KeyBinding.set();
|
||||
|
||||
Term.pause();
|
||||
});
|
||||
|
||||
|
||||
cloudcmd.Terminal.Keys = (function(){
|
||||
/* loading js and css*/
|
||||
|
|
@ -73,23 +93,17 @@ var CloudCommander, $;
|
|||
|
||||
var key_event = function(event){
|
||||
/* если клавиши можно обрабатывать */
|
||||
if(Hidden && KeyBinding.get() && event.keyCode === cloudcmd.KEY.TRA){
|
||||
Hidden = false;
|
||||
|
||||
Util.show(TerminalId);
|
||||
TerminalId.focus();
|
||||
|
||||
JqueryTerminal.show();
|
||||
}
|
||||
if(Hidden &&
|
||||
KeyBinding.get() &&
|
||||
event.keyCode === cloudcmd.KEY.TRA){
|
||||
JqueryTerminal.show();
|
||||
event.preventDefault();
|
||||
}
|
||||
|
||||
else if(!Hidden && event.keyCode === cloudcmd.KEY.ESC)
|
||||
JqueryTerminal.hide();
|
||||
|
||||
|
||||
if(!Hidden && event.keyCode === cloudcmd.KEY.ESC){
|
||||
Hidden = true;
|
||||
Util.hide(TerminalId);
|
||||
|
||||
Util.showPanel();
|
||||
Util.getPanel().focus();
|
||||
KeyBinding.set();
|
||||
}
|
||||
};
|
||||
|
||||
/* добавляем обработчик клавишь */
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ var CloudCommander, CloudFunc, $;
|
|||
overlay : {
|
||||
opacity: 0.1,
|
||||
css : {
|
||||
'background-color' : '#fff'
|
||||
'background-color' : '#fff'
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ var CloudServer = {
|
|||
* хранащий информацию в виде
|
||||
* Statuses[name] = 404;
|
||||
*/
|
||||
Statuses : {},
|
||||
Statuses : {},
|
||||
|
||||
/*
|
||||
* queries of file params
|
||||
|
|
@ -253,8 +253,7 @@ CloudServer.generateHeaders = function(pName, pGzip){
|
|||
*/
|
||||
CloudServer._controller = function(pReq, pRes)
|
||||
{
|
||||
/* Читаем содержимое папки, переданное в url
|
||||
*/
|
||||
/* Читаем содержимое папки, переданное в url */
|
||||
var url = require("url");
|
||||
var lParsedUrl = url.parse(pReq.url);
|
||||
var pathname = lParsedUrl.pathname;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue