You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/10/16 03:08:18 UTC
svn commit: r1398596 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js:
util/Obj.js view/ApplicationView.js view/panels/console.js
Author: tveronezi
Date: Tue Oct 16 01:08:18 2012
New Revision: 1398596
URL: http://svn.apache.org/viewvc?rev=1398596&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-469
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/Obj.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/Obj.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/Obj.js?rev=1398596&r1=1398595&r2=1398596&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/Obj.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/util/Obj.js Tue Oct 16 01:08:18 2012
@@ -33,6 +33,10 @@ TOMEE.utils = (function () {
return 'alt';
}
+ if(keyCode === 27) {
+ return 'esc';
+ }
+
// Numbers or Letters
if (keyCode >= 48 && keyCode <= 57 || //Numbers
keyCode >= 65 && keyCode <= 90) { //Letters
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js?rev=1398596&r1=1398595&r2=1398596&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/ApplicationView.js Tue Oct 16 01:08:18 2012
@@ -71,7 +71,8 @@ TOMEE.ApplicationView = function () {
}
if (key.length === 0 &&
- !(ev.keyCode >= 112 && ev.keyCode <= 123)) { //F1 -> F12
+ !ev.keyCode === 27 && // ESC
+ !(ev.keyCode >= 112 && ev.keyCode <= 123)) { // F1 -> F12
return; //nothing to do
}
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js?rev=1398596&r1=1398595&r2=1398596&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js Tue Oct 16 01:08:18 2012
@@ -32,9 +32,12 @@ TOMEE.ApplicationTabConsole = function (
triggerScriptExecution();
});
+ channel.bind('ui-actions', 'window-esc-pressed', function () {
+ clearConsole();
+ });
+
container.find('.tomee-execute-clear-btn').on('click', function () {
- var consoleOutput = container.find('.tomee-console-output');
- consoleOutput.empty();
+ clearConsole();
});
channel.bind('ui-actions', 'container-resized', function (data) {
@@ -59,6 +62,15 @@ TOMEE.ApplicationTabConsole = function (
consoleOutput.prepend(newLine);
});
+ function clearConsole() {
+ if(!active) {
+ return;
+ }
+
+ var consoleOutput = container.find('.tomee-console-output');
+ consoleOutput.empty();
+ }
+
function triggerScriptExecution() {
if(!active) {
return;