You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/04/13 18:58:44 UTC
[2/3] git commit: Converts debug=console to jQuery based
Converts debug=console to jQuery based
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/ceeeaf0f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/ceeeaf0f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/ceeeaf0f
Branch: refs/heads/develop
Commit: ceeeaf0fa0bd92ee524d393713909f5003c7c983
Parents: 33985e2
Author: Lukasz Lenart <lu...@apache.org>
Authored: Sun Apr 13 18:38:52 2014 +0200
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Sun Apr 13 18:38:52 2014 +0200
----------------------------------------------------------------------
.../struts2/interceptor/debugging/console.ftl | 4 +-
.../interceptor/debugging/webconsole.html | 30 +++---
.../struts2/interceptor/debugging/webconsole.js | 99 ++++++++++----------
3 files changed, 64 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/ceeeaf0f/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl
----------------------------------------------------------------------
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 67d0293..552aa9d 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.
*/
-->
+<!DOCTYPE html>
<html>
<head>
<script type="text/javascript">
var baseUrl = "<@s.url value="/struts" includeParams="none"/>";
- window.open(baseUrl+"/webconsole.html", 'OGNL Console','width=500,height=450,'+
- 'status=no,toolbar=no,menubar=no');
+ window.open(baseUrl+"/webconsole.html", 'OGNL Console','width=500,height=450,status=no,toolbar=no,menubar=no');
</script>
</head>
<body>
http://git-wip-us.apache.org/repos/asf/struts/blob/ceeeaf0f/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.html
----------------------------------------------------------------------
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 ca75fcd..9674c03 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.
*/
-->
+<!DOCTYPE html>
<html>
<head>
- <link rel="stylesheet" type="text/css" href="webconsole.css" />
-<script src="webconsole.js"></script>
-<script src="dojo/dojo.js"></script>
-<script src="dojo/src/event/__package__.js"></script>
-<title>OGNL Console</title>
+ <link rel="stylesheet" type="text/css" href="webconsole.css"/>
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+ <script src="webconsole.js"></script>
+ <title>OGNL Console</title>
</head>
<body>
-<div id="shell" >
- <form onsubmit="return false" id="wc-form">
- <div class="wc-results" id="wc-result">
- Welcome to the OGNL console!
- <br />
- :->
- </div>
- <input type="hidden" name="debug" value="command" />
- <input name="expression" onkeyup="keyEvent(event)" class="wc-command" id="wc-command" type="text" />
- </form>
+<div id="shell">
+ <form onsubmit="return false" id="wc-form">
+ <div class="wc-results" id="wc-result">
+ Welcome to the OGNL console!
+ <br/>
+ :->
+ </div>
+ <input type="hidden" name="debug" value="command"/>
+ <input name="expression" onkeyup="keyEvent(event)" class="wc-command" id="wc-command" type="text"/>
+ </form>
</div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/ceeeaf0f/core/src/main/resources/org/apache/struts2/interceptor/debugging/webconsole.js
----------------------------------------------------------------------
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 5eaa6fa..ee9e07e 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(':-> '));
+
+ 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;
- 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;
+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;