diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl b/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl index dae644052..87175ce6c 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl @@ -20,6 +20,7 @@ * under the License. */ --> + - - - - + diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl index 67d0293da..552aa9d80 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl @@ -20,12 +20,12 @@ * under the License. */ --> + diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html b/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html index ca75fcd06..9674c035f 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html @@ -20,25 +20,25 @@ * under the License. */ --> + - - - - -OGNL Console + + + + OGNL Console -
-
-
- Welcome to the OGNL console! -
- :-> -
- - -
+
+
+
+ Welcome to the OGNL console! +
+ :-> +
+ + +
diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.js b/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.js index 5eaa6fa02..ee9e07e1f 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.js +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.js @@ -19,62 +19,57 @@ * under the License. */ - function printResult(result_string) - { - var result_div = document.getElementById('wc-result'); - var result_array = result_string.split('\n'); +function printResult(result_string) { + var result_div = document.getElementById('wc-result'); + var result_array = result_string.split('\n'); - var new_command = document.getElementById('wc-command').value; - result_div.appendChild(document.createTextNode(new_command)); - result_div.appendChild(document.createElement('br')); + var new_command = document.getElementById('wc-command').value; + result_div.appendChild(document.createTextNode(new_command)); + result_div.appendChild(document.createElement('br')); - for (var line_index in result_array) { - var result_wrap = document.createElement('pre') - line = document.createTextNode(result_array[line_index]); - result_wrap.appendChild(line); - result_div.appendChild(result_wrap); - result_div.appendChild(document.createElement('br')); + for (var line_index in result_array) { + var result_wrap = document.createElement('pre') + line = document.createTextNode(result_array[line_index]); + result_wrap.appendChild(line); + result_div.appendChild(result_wrap); + result_div.appendChild(document.createElement('br')); - } - result_div.appendChild(document.createTextNode(':-> ')); - - result_div.scrollTop = result_div.scrollHeight; - document.getElementById('wc-command').value = ''; } + result_div.appendChild(document.createTextNode(':-> ')); - function keyEvent(event, url) - { - switch(event.keyCode){ - case 13: - var the_shell_command = document.getElementById('wc-command').value; - if (the_shell_command) { - commands_history[commands_history.length] = the_shell_command; - history_pointer = commands_history.length; - var the_url = url ? url : window.opener.location.pathname; - dojo.io.bind({ - url: the_url, - formNode: dojo.byId("wc-form"), - load: function(type, data, evt){ printResult(data); }, - mimetype: "text/plain" - }); - } - break; - case 38: // this is the arrow up - if (history_pointer > 0) { - history_pointer--; - document.getElementById('wc-command').value = commands_history[history_pointer]; - } - break; - case 40: // this is the arrow down - if (history_pointer < commands_history.length - 1 ) { - history_pointer++; - document.getElementById('wc-command').value = commands_history[history_pointer]; - } - break; - default: - break; + result_div.scrollTop = result_div.scrollHeight; + document.getElementById('wc-command').value = ''; +} + +function keyEvent(event, url) { + switch (event.keyCode) { + case 13: + var the_shell_command = document.getElementById('wc-command').value; + if (the_shell_command) { + commands_history[commands_history.length] = the_shell_command; + history_pointer = commands_history.length; + var the_url = url ? url : window.opener.location.pathname; + jQuery.post(the_url, jQuery("#wc-form").serialize(), function (data) { + printResult(data); + }); } - } + break; + case 38: // this is the arrow up + if (history_pointer > 0) { + history_pointer--; + document.getElementById('wc-command').value = commands_history[history_pointer]; + } + break; + case 40: // this is the arrow down + if (history_pointer < commands_history.length - 1) { + history_pointer++; + document.getElementById('wc-command').value = commands_history[history_pointer]; + } + break; + default: + break; + } +} - var commands_history = new Array(); - var history_pointer; +var commands_history = []; +var history_pointer;