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:01:47 UTC
svn commit: r1398593 - in
/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels:
console.js log.js
Author: tveronezi
Date: Tue Oct 16 01:01:47 2012
New Revision: 1398593
URL: http://svn.apache.org/viewvc?rev=1398593&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-469
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/console.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
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=1398593&r1=1398592&r2=1398593&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:01:47 2012
@@ -21,15 +21,15 @@ TOMEE.ApplicationTabConsole = function (
var channel = TOMEE.ApplicationChannel,
container = $(TOMEE.ApplicationTemplates.getValue('application-tab-console', {})),
- codeArea = null;
+ codeArea = null,
+ active = false;
container.find('.tomee-execute-btn').on('click', function () {
- var btn = container.find('.tomee-execute-btn');
- btn.prop('disabled', true);
+ triggerScriptExecution();
+ });
- channel.send('ui-actions', 'execute-script', {
- text:codeArea.getValue()
- });
+ channel.bind('ui-actions', 'window-F5-pressed', function () {
+ triggerScriptExecution();
});
container.find('.tomee-execute-clear-btn').on('click', function () {
@@ -59,6 +59,20 @@ TOMEE.ApplicationTabConsole = function (
consoleOutput.prepend(newLine);
});
+ function triggerScriptExecution() {
+ if(!active) {
+ return;
+ }
+
+ var btn = container.find('.tomee-execute-btn');
+ btn.prop('disabled', true);
+
+ channel.send('ui-actions', 'execute-script', {
+ text:codeArea.getValue()
+ });
+ }
+
+
return {
getEl:function () {
return container;
@@ -71,8 +85,10 @@ TOMEE.ApplicationTabConsole = function (
});
}
codeArea.focus();
+ active = true;
},
onDetach:function () {
+ active = false;
}
};
};
\ No newline at end of file
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js?rev=1398593&r1=1398592&r2=1398593&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/app/js/view/panels/log.js Tue Oct 16 01:01:47 2012
@@ -21,7 +21,8 @@ TOMEE.ApplicationTabLog = function () {
var channel = TOMEE.ApplicationChannel,
container = $(TOMEE.ApplicationTemplates.getValue('application-tab-log', {})),
- selectedFile = null;
+ selectedFile = null,
+ active = false;
channel.bind('ui-actions', 'container-resized', function (data) {
var consoleOutput = container.find('.tomee-log-output'),
@@ -62,18 +63,26 @@ TOMEE.ApplicationTabLog = function () {
});
container.find('.log-file-name').on('click', function() {
- if(!selectedFile) {
- return;
- }
- channel.send('ui-actions', 'log-file-selected', {
- file:selectedFile
- });
+ triggerFileSelected();
});
channel.bind('ui-actions', 'log-file-selected', function (param) {
setFileName(param.file);
});
+ channel.bind('ui-actions', 'window-F5-pressed', function () {
+ triggerFileSelected();
+ });
+
+ function triggerFileSelected() {
+ if(!active || !selectedFile) {
+ return;
+ }
+ channel.send('ui-actions', 'log-file-selected', {
+ file:selectedFile
+ });
+ }
+
function setFileName(name) {
var el = container.find('.log-file-name');
el.html(name);
@@ -85,8 +94,10 @@ TOMEE.ApplicationTabLog = function () {
return container;
},
onAppend:function () {
+ active = true;
},
onDetach:function () {
+ active = false;
}
};
};
\ No newline at end of file