diff --git a/lib/client/console.js b/lib/client/console.js index 9fd4281e..01b30663 100644 --- a/lib/client/console.js +++ b/lib/client/console.js @@ -48,8 +48,10 @@ var CloudCmd, Util, DOM, $; // Handle a command. var handler = function(command) { - if (command) + if (command) { + Images.showLoad({ top:true }); CloudCmd.Socket.send(command); + } jqconsole.Prompt(true, handler); }; @@ -89,14 +91,15 @@ var CloudCmd, Util, DOM, $; } function listener(pEvent){ - var lF10 = Key.F10, + var lTRA = Key.TRA, lESC = Key.ESC, lIsBind = Key.isBind(), lKey = pEvent.keyCode; switch(lKey){ - case lF10: - Console.show(); + case lTRA: + if (lIsBind) + Console.show(); break; case lESC: Console.hide(); diff --git a/lib/client/socket.js b/lib/client/socket.js index fc5f7dca..83843e4c 100644 --- a/lib/client/socket.js +++ b/lib/client/socket.js @@ -10,10 +10,6 @@ var CloudCmd, Util, DOM, jqconsole, io; ERROR_MSG = 'could not connect to socket.io\n'+ 'npm i socket.io'; - function getTerminal(){ - return CloudCmd.Terminal.JqueryTerminal; - } - DOM.jsload('/socket.io/lib/socket.io.js', { onerror : Util.retExec(Util.log, ERROR_MSG), @@ -23,13 +19,7 @@ var CloudCmd, Util, DOM, jqconsole, io; CloudCmd.Socket = socket; socket.on('connect', function () { - Terminal = getTerminal(); - - if(Terminal){ - outToTerminal({stdout: 'socket connected'}); - - Terminal.Term.resume(); - } + outToTerminal({stdout: 'socket connected'}); }); socket.on('message', function (msg) { @@ -40,38 +30,25 @@ var CloudCmd, Util, DOM, jqconsole, io; }); socket.on('disconnect', function () { - Terminal = getTerminal(); - - if(Terminal){ - outToTerminal({stderr: 'socket disconected'}); - - Terminal.Term.pause(); - } + outToTerminal({stderr: 'socket disconected'}); }); } }); function outToTerminal(pMsg){ - var lResult, lTerm; + var lResult, lTerm, lStdout, lStderr; - Terminal = getTerminal(); - if(Terminal) - lTerm = Terminal.Term; - else { - var lEcho = function(pResult){ - CloudCmd.Console.jqconsole.Write(pResult); - }; - - lTerm = { - echo : lEcho, - error : lEcho - }; - } + var lEcho = function(pResult){ + CloudCmd.Console.jqconsole.Write(pResult + '\n'); + DOM.Images.hideLoad(); + }; - if(lTerm){ - var lStdout, - lStderr; - + lTerm = { + echo : lEcho, + error : lEcho + }; + + if(CloudCmd.Console.jqconsole){ if(Messages.length){ /* show oll msg from buffer */ for(var i = 0, n = Messages.length; i < n; i++){