From 288e70bd3988726f4fb0e9f138430597e02b8054 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Mon, 3 Feb 2014 10:46:47 -0500 Subject: [PATCH] fix(terminal) add rmKeys --- lib/client/terminal.js | 14 ++++++++++---- lib/client/view.js | 10 +++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lib/client/terminal.js b/lib/client/terminal.js index 5a5c645b..84ed1adb 100644 --- a/lib/client/terminal.js +++ b/lib/client/terminal.js @@ -21,6 +21,11 @@ var CloudCmd, Util, DOM, CloudFunc, Terminal; Util.loadOnLoad([ DOM.jqueryLoad, CloudCmd.View, + /* rm view keys, it ruin terminal */ + function(callback) { + CloudCmd.View.rmKeys(), + Util.exec(callback); + }, load, CloudCmd.Socket, CloudTerm.show, @@ -64,7 +69,7 @@ var CloudCmd, Util, DOM, CloudFunc, Terminal; } CloudCmd.View.show(Element, function() { - Term.element.focus(); + Element.focus(); Terminal.brokenBold = true; Util.exec(callback); @@ -96,9 +101,10 @@ var CloudCmd, Util, DOM, CloudFunc, Terminal; }); Term.on('keydown', listener); - + Term.on('data', function(data) { - socket.emit('terminal-data', data); + if (data) + socket.emit('terminal-data', data); }); //Term.resize(size.cols, size.rows); @@ -118,7 +124,7 @@ var CloudCmd, Util, DOM, CloudFunc, Terminal; cols: cols, rows: rows }; - + return size; } diff --git a/lib/client/view.js b/lib/client/view.js index 1f8d1231..f3d034fc 100644 --- a/lib/client/view.js +++ b/lib/client/view.js @@ -21,7 +21,7 @@ var CloudCmd, Util, DOM, CloudFunc, $; Key.unsetBind(); }, beforeClose : Key.setBind, - + loop : false, openEffect : 'none', closeEffect : 'none', autoSize : false, @@ -34,6 +34,14 @@ var CloudCmd, Util, DOM, CloudFunc, $; View.show = show; View.hide = hide; + View.rmKeys = rmKeys; + + function rmKeys() { + /* remove default key binding + * which is ruin terminal + */ + $.fancybox.defaults.keys = null; + } function init() { var lFunc, lIsFunc, lIsCallBack;