From 4fb70bda7f9fdf28282f315aa72d443227437214 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Thu, 10 Jan 2013 04:21:42 -0500 Subject: [PATCH] fixed bug with height of terminal --- ChangeLog | 2 ++ config.json | 6 +++--- lib/client/dom.js | 2 +- lib/client/terminal.js | 9 ++++++--- lib/server/rest.js | 1 - 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 463161af..114024b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,8 @@ keyStop: function(e, opt) { * Improved optimizing size of menu.js from 2539 to 2444. +* Fixed bug with height of terminal. + 2012.12.12, Version 0.1.8 diff --git a/config.json b/config.json index a0a1012c..aa2b1a72 100644 --- a/config.json +++ b/config.json @@ -4,9 +4,9 @@ "cache" : {"allowed" : false}, "minification" : { "js" : false, - "css" : true, - "html" : true, - "img" : true + "css" : false, + "html" : false, + "img" : false }, "github_key" : "891c251b925e4e967fa9", "github_secret" : "afe9bed1e810c5dc44c4c2a953fc6efb1e5b0545", diff --git a/lib/client/dom.js b/lib/client/dom.js index c6a70cb9..788002c4 100644 --- a/lib/client/dom.js +++ b/lib/client/dom.js @@ -818,7 +818,7 @@ var CloudCommander, Util, if( !Util.checkExtension(lName, lExt) ) lName += lExt; } - + Util.exec(pCallBack, { data: pData, name: lName diff --git a/lib/client/terminal.js b/lib/client/terminal.js index c39d06a0..baea0094 100644 --- a/lib/client/terminal.js +++ b/lib/client/terminal.js @@ -31,8 +31,7 @@ var CloudCommander, Util, DOM, $; DOM.anyLoadOnLoad([lFiles], function(){ console.timeEnd('terminal load'); - init(); - + init(); $(function($, undefined) { Term = JqueryTerminal.Term = $('#terminal').terminal(function(command, term){ term.echo(''); @@ -49,6 +48,10 @@ var CloudCommander, Util, DOM, $; $(window).unbind('resize'); Util.exec(pCallBack); + }).cssSet({id:'terminalStyle', + inner: '.cloudTerminal{' + + 'height: 720px;' + + '};' }); } @@ -60,7 +63,7 @@ var CloudCommander, Util, DOM, $; TerminalId = DOM.anyload({ name : 'div', id : 'terminal', - className : 'panel', + className : 'panel cloudTerminal', parent : DOM.getFM() }); } diff --git a/lib/server/rest.js b/lib/server/rest.js index c963251f..6957bb31 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -117,7 +117,6 @@ mesage: 'Cloud Commander was killed' }; send(pParams); - lResult = null; break; }