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/03/13 09:24:12 UTC
[3/3] git commit: Updates expected test results to meet new
requirements for action: prefix
Updates expected test results to meet new requirements for action: prefix
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/83bdfcb5
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/83bdfcb5
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/83bdfcb5
Branch: refs/heads/feature/use-js-to-support-multiple-buttons
Commit: 83bdfcb57bc28139012e711a2f542acf90bfad4a
Parents: 706b289
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Mar 13 09:23:17 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Mar 13 09:23:17 2014 +0100
----------------------------------------------------------------------
.../org/apache/struts2/views/jsp/ui/Reset-1.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Reset-2.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Reset-3.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Reset-4.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Reset-5.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Reset-6.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Reset-7.txt | 11 ++++++++++-
.../org/apache/struts2/views/jsp/ui/Reset-8.txt | 11 ++++++++++-
.../org/apache/struts2/views/jsp/ui/Reset-9.txt | 2 +-
.../org/apache/struts2/views/jsp/ui/Submit-7.txt | 10 +++++++++-
.../org/apache/struts2/views/jsp/ui/Submit-8.txt | 12 ++++++++++--
11 files changed, 46 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
index c89899b..9a63734 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-1.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="left"><input type="reset" name="myname" value="bar"/></div></td>
+ <td colspan="2"><div align="left"><input type="reset" id="myname" name="myname" value="bar"/></div></td>
</tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
index 279c143..d3f3af0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-2.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><input type="reset" name="myname" value="Reset" title="mytitle"/></div></td>
+ <td colspan="2"><div align="right"><input type="reset" id="myname" name="myname" value="Reset" title="mytitle"/></div></td>
</tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
index 9497bb6..3152859 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-3.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><button type="reset" name="myname" value="bar">bar</button></div></td>
+ <td colspan="2"><div align="right"><button type="reset" id="myname" name="myname" value="bar">bar</button></div></td>
</tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
index 3fa4c37..e0e0589 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="left"><button type="reset" name="myname" value="bar">mylabel</button></div></td>
+ <td colspan="2"><div align="left"><button type="reset" id="myname" name="myname" value="bar">mylabel</button></div></td>
</tr>
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
index fbab3f6..67df7bd 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><button type="reset" name="myname" value="bar" disabled="disabled">bar</button></div></td>
+ <td colspan="2"><div align="right"><button type="reset" id="myname" name="myname" value="bar" disabled="disabled">bar</button></div></td>
</tr>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
index 39a2906..14038a0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
@@ -1,3 +1,3 @@
<tr>
- <td colspan="2"><div align="right"><button type="reset" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
+ <td colspan="2"><div align="right"><button type="reset" id="myname" name="myname" value="bar"><img alt="mylabel" src="some.gif"/></button></div></td>
</tr>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-7.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-7.txt
index cfb2b02..6330bf1 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-7.txt
@@ -1 +1,10 @@
-<button type="reset" name="action:manager!update" value="Reset">mylabel</button>
\ No newline at end of file
+<button type="reset" id="myname" name="action:manager!update" value="Reset" onclick="submitAction_myname(this);">
+mylabel
+</button>
+
+<script>
+ function submitAction_myname(element) {
+ element.form.action = 'manager!update';
+ element.form.submit();
+ }
+</script>
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-8.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-8.txt
index 33b28d0..405bae0 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-8.txt
@@ -1 +1,10 @@
-<button type="reset" name="action:manager" value="Reset">mylabel</button>
\ No newline at end of file
+<button type="reset" id="myname" name="action:manager" value="Reset" onclick="submitAction_myname(this);">
+mylabel
+</button>
+
+<script>
+ function submitAction_myname(element) {
+ element.form.action = 'manager';
+ element.form.submit();
+ }
+</script>
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-9.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-9.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-9.txt
index bde52ac..6d90431 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-9.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-9.txt
@@ -1 +1 @@
-<button type="reset" name="method:update" value="Reset">mylabel</button>
\ No newline at end of file
+<button type="reset" id="myname" name="method:update" value="Reset">mylabel</button>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-7.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-7.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-7.txt
index 1a10a6c..69fb404 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-7.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-7.txt
@@ -1,2 +1,10 @@
-<button type="submit" id="myname" name="action:manager!update" value="Submit">mylabel
+<button type="submit" id="myname" name="action:manager!update" value="Submit" onclick="submitAction_myname(this);">
+mylabel
</button>
+
+<script>
+ function submitAction_myname(element) {
+ element.form.action = 'manager!update';
+ element.form.submit();
+ }
+</script>
http://git-wip-us.apache.org/repos/asf/struts/blob/83bdfcb5/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-8.txt
----------------------------------------------------------------------
diff --git a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-8.txt b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-8.txt
index de4563c..f805181 100644
--- a/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-8.txt
+++ b/core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-8.txt
@@ -1,2 +1,10 @@
-<button type="submit" id="myname" name="action:manager" value="Submit">mylabel
-</button>
\ No newline at end of file
+<button type="submit" id="myname" name="action:manager" value="Submit" onclick="submitAction_myname(this);">
+mylabel
+</button>
+
+<script>
+ function submitAction_myname(element) {
+ element.form.action = 'manager';
+ element.form.submit();
+ }
+</script>