[4/4] struts git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/5cf3381b Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/5cf3381b Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/5cf3381b Branch: refs/heads/master Commit: 5cf3381b898b3cf6aba6b59744de6ab13a76edaa Parents: 3e1087a 9e0aa50 Author: Johannes Geppert Authored: Tue Aug 4 22:02:38 2015 +0200 Committer: Johannes Geppert Committed: Tue Aug 4 22:02:38 2015 +0200 -- src/site/site.xml | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) --
[3/4] struts git commit: WW-4532 Javascript generated by s:doubleselect has global variables that can interfer with the rest of the app
WW-4532 Javascript generated by s:doubleselect has global variables that can
interfer with the rest of the app
- Fix problem with missing var for loop variable and possible mixed scope
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/3e1087a7
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/3e1087a7
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/3e1087a7
Branch: refs/heads/master
Commit: 3e1087a7fa1b2ee32ce7b9fc8d8f289f2fd7d2fa
Parents: 0469947
Author: Johannes Geppert
Authored: Tue Aug 4 22:02:24 2015 +0200
Committer: Johannes Geppert
Committed: Tue Aug 4 22:02:24 2015 +0200
--
core/src/main/resources/template/simple/debug.ftl| 6 +++---
.../main/resources/template/simple/doubleselect.ftl | 15 ++-
.../apache/struts2/views/jsp/ui/DoubleSelect-1.txt | 9 +
.../apache/struts2/views/jsp/ui/DoubleSelect-2.txt | 9 +
.../apache/struts2/views/jsp/ui/DoubleSelect-3.txt | 9 +
.../apache/struts2/views/jsp/ui/DoubleSelect-4.txt | 9 +
6 files changed, 29 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/3e1087a7/core/src/main/resources/template/simple/debug.ftl
--
diff --git a/core/src/main/resources/template/simple/debug.ftl
b/core/src/main/resources/template/simple/debug.ftl
index da40aeb..492ee76 100644
--- a/core/src/main/resources/template/simple/debug.ftl
+++ b/core/src/main/resources/template/simple/debug.ftl
@@ -42,12 +42,12 @@
table.debugTable th, table.debugTable td {padding:2px;}
-->
-
+
${parameters.id?html}<#else>debug');return false;">[Debug]
${parameters.id?html}<#else>debug">
Struts ValueStack Debug
-
+
Value Stack Contents
@@ -69,7 +69,7 @@
-
+
Stack Context
These items are available using the #key notation
http://git-wip-us.apache.org/repos/asf/struts/blob/3e1087a7/core/src/main/resources/template/simple/doubleselect.ftl
--
diff --git a/core/src/main/resources/template/simple/doubleselect.ftl
b/core/src/main/resources/template/simple/doubleselect.ftl
index 313eb16..5485755 100644
--- a/core/src/main/resources/template/simple/doubleselect.ftl
+++ b/core/src/main/resources/template/simple/doubleselect.ftl
@@ -75,8 +75,9 @@
[2/4] struts git commit: WW-4532 Javascript generated by s:doubleselect has global variables that can interfer with the rest of the app
WW-4532 Javascript generated by s:doubleselect has global variables that can
interfer with the rest of the app
- Follow jslint recommendations in javascript resources
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/0469947e
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/0469947e
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/0469947e
Branch: refs/heads/master
Commit: 0469947e67e42dccd6e459bd93e1565e52250895
Parents: 49c43b3
Author: Johannes Geppert
Authored: Tue Aug 4 22:01:39 2015 +0200
Committer: Johannes Geppert
Committed: Tue Aug 4 22:01:39 2015 +0200
--
.../struts2/interceptor/debugging/webconsole.js | 95 +--
.../struts2/static/inputtransferselect.js | 117 ++---
.../struts2/static/optiontransferselect.js | 171 ++-
.../org/apache/struts2/static/utils.js | 4 +-
.../resources/template/css_xhtml/validation.js | 6 +-
5 files changed, 199 insertions(+), 194 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/0469947e/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 ee9e07e..2068e61 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
@@ -1,6 +1,4 @@
/*
- * $Id$
- *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -19,57 +17,58 @@
* under the License.
*/
-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'));
+function printResult(resultString) {
+var resultDiv = document.getElementById('wc-result');
+var resultArray = resultString.split('\n');
- 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'));
+var newCommand = document.getElementById('wc-command').value;
+resultDiv.appendChild(document.createTextNode(newCommand));
+resultDiv.appendChild(document.createElement('br'));
- }
- result_div.appendChild(document.createTextNode(':-> '));
+for (var lineIndex in resultArray) {
+if (resultArray.hasOwnProperty(lineIndex)) {
+var resultWrap = document.createElement('pre'),
+line = document.createTextNode(resultArray[lineIndex]);
+resultWrap.appendChild(line);
+resultDiv.appendChild(resultWrap);
+resultDiv.appendChild(document.createElement('br'));
+}
+}
+resultDiv.appendChild(document.createTextNode(':-> '));
- result_div.scrollTop = result_div.scrollHeight;
- document.getElementById('wc-command').value = '';
+resultDiv.scrollTop = resultDiv.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;
- }
+switch (event.keyCode) {
+case 13:
+var theShellCommand = document.getElementById('wc-command').value;
+if (theShellCommand) {
+commandsHistory[commandsHistory.length] = th
[1/4] struts git commit: WW-4532 Javascript generated by s:doubleselect has global variables that can interfer with the rest of the app
Repository: struts
Updated Branches:
refs/heads/master 9e0aa504e -> 5cf3381b8
WW-4532 Javascript generated by s:doubleselect has global variables that can
interfer with the rest of the app
- Introduce new build plugin to automatically execute jslint checks during
build on javascript resources
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/49c43b37
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/49c43b37
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/49c43b37
Branch: refs/heads/master
Commit: 49c43b377e9f7de91dc474a6d191775126084343
Parents: 5cf0671
Author: Johannes Geppert
Authored: Tue Aug 4 22:00:16 2015 +0200
Committer: Johannes Geppert
Committed: Tue Aug 4 22:00:16 2015 +0200
--
core/pom.xml | 23 +++
core/src/main/resources/jshint.conf.js | 13 +
2 files changed, 36 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/struts/blob/49c43b37/core/pom.xml
--
diff --git a/core/pom.xml b/core/pom.xml
index e3644db..b5088f7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -106,6 +106,29 @@
+
+com.cj.jshintmojo
+jshint-maven-plugin
+
+
+
+lint
+
+
+
+
+src/main/resources/jshint.conf.js
+
+src/main/resources/
+
+
+
src/main/resources/org/apache/struts2/static/domTT.js
+
+jslint
+target/jshint.xml
+true
+
+
http://git-wip-us.apache.org/repos/asf/struts/blob/49c43b37/core/src/main/resources/jshint.conf.js
--
diff --git a/core/src/main/resources/jshint.conf.js
b/core/src/main/resources/jshint.conf.js
new file mode 100644
index 000..350b03a
--- /dev/null
+++ b/core/src/main/resources/jshint.conf.js
@@ -0,0 +1,13 @@
+{
+"maxparams": 5,
+"indent": true,
+"camelcase": true,
+"eqeqeq": true,
+"forin": true,
+"immed": true,
+"latedef": false,
+"noarg": true,
+"noempty": true,
+"nonew": true,
+"globals": {}
+}
\ No newline at end of file
