[3/3] git commit: WW-4322 Uses jQuery instead of Dojo with DebuggingInterceptor
WW-4322 Uses jQuery instead of Dojo with DebuggingInterceptor Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/90eb79ad Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/90eb79ad Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/90eb79ad Branch: refs/heads/develop Commit: 90eb79ad81a3c98dce01a08cebedd2abc398925f Parents: 96156df ceeeaf0 Author: Lukasz Lenart Authored: Sun Apr 13 18:53:34 2014 +0200 Committer: Lukasz Lenart Committed: Sun Apr 13 18:53:34 2014 +0200 -- .../struts2/interceptor/debugging/browser.ftl | 21 + .../struts2/interceptor/debugging/console.ftl | 4 +- .../interceptor/debugging/webconsole.html | 30 +++--- .../struts2/interceptor/debugging/webconsole.js | 99 ++-- 4 files changed, 67 insertions(+), 87 deletions(-) --
[1/3] git commit: Converts debug=browser to jQuery based
Repository: struts
Updated Branches:
refs/heads/develop 96156dfa1 -> 90eb79ad8
Converts debug=browser 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/33985e26
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/33985e26
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/33985e26
Branch: refs/heads/develop
Commit: 33985e26ea8c9c3f4d5ece7adc3c9e8223932fe5
Parents: 96156df
Author: Lukasz Lenart
Authored: Sun Apr 13 18:38:23 2014 +0200
Committer: Lukasz Lenart
Committed: Sun Apr 13 18:38:23 2014 +0200
--
.../struts2/interceptor/debugging/browser.ftl | 21 +++-
1 file changed, 3 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/33985e26/core/src/main/resources/org/apache/struts2/interceptor/debugging/browser.ftl
--
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 dae6440..87175ce 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.
*/
-->
+
.debugTable {
@@ -52,22 +53,9 @@
background-color: #EE;
}
-
-// Dojo configuration
-djConfig = {
-isDebug: false,
-bindEncoding: "UTF-8"
-,baseRelativePath: "${base}/struts/dojo/"
-,baseScriptUri: "${base}/struts/dojo/"
-};
-
-
-
-
+
-dojo.require("dojo.io.*");
-
function expand(src, path) {
var baseUrl = location.href;
var i = baseUrl.indexOf("&object=");
@@ -75,9 +63,7 @@
if (baseUrl.indexOf("decorate") < 0) {
baseUrl += "&decorate=false";
}
- dojo.io.bind({
-url: baseUrl,
-load : function(type, data, evt) {
+ jQuery.get(baseUrl, function(data) {
var div = document.createElement("div");
div.innerHTML = data;
src.parentNode.appendChild(div);
@@ -89,7 +75,6 @@
src.parentNode.removeChild(div);
src.onclick = oldonclick;
};
-}
});
}
[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
Authored: Sun Apr 13 18:38:52 2014 +0200
Committer: Lukasz Lenart
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.
*/
-->
+
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');
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.
*/
-->
+
-
-
-
-
-OGNL Console
+
+
+
+ OGNL Console
-
-
-
- Welcome to the OGNL console!
-
- :->
-
-
-
-
+
+
+
+ Welcome to the OGNL console!
+
+ :->
+
+
+
+
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 = '';
}
+ resul
[CONF] Confluence Changes in the last 24 hours
Confluence Changes in the last 24 hours Apache Camel Pages Page: Load Balancer edited by Bilgin Ibryam [04:50 PM] (View Changes) Page: Camel 2.14.0 Release edited by Bilgin Ibryam [04:48 PM] (View Changes) Apache Flex Pages Page: Documentation of the actual Mavenization Process created by Christofer Dutz [09:48 PM] Apache Maven Pages Page: Resolution scenarios for plugins edited by Robert Scholte [07:32 AM] (View Changes) Apache OpenOffice Community Pages Page: AOO 4.1 Примечания к релизу (Русский) edited by Yakov [07:02 PM] (View Changes) Page: 2014 Jul created by Andrea Pescetti [09:35 AM] Page: 2014 Apr edited by Andrea Pescetti [06:47 AM] (View Changes) Apache Openmeetings Pages Page: ASUS Notebook Terbaik Favoritku created by idlogs san [07:10 PM] Page: Tentang ASUS Notebook Terbaik Dan Favoritku created by Yusuf Efendy [10:19 AM] Page: ASUS Notebook Terbaik dan Favoritku - Review created by Kardian Karker [12:50 AM] Page: Hasil Piala FA Cup Tadi Malam created by dellmensen [12:20 AM] Apache Roller Pages Page: WhoUsesRoller edited by Glen Mazza [08:59 PM] (View Changes) Home page: Roller Wiki edited by Glen Mazza [08:58 PM] (View Changes) Apache Synapse Comments Page: JMS Transport Specifications has a new comment [ Anonymous ] Traffic Server Pages Page: Presentations edited by Phil Sorber [06:07 AM] (View Changes)
