Author: musachy Date: Mon Dec 8 12:22:33 2008 New Revision: 724471 URL: http://svn.apache.org/viewvc?rev=724471&view=rev Log: WW-2730 remove redundant "return true" from the form tag's "onsubmit" attribute
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl (original) +++ struts/struts2/trunk/core/src/main/resources/template/simple/form-common.ftl Mon Dec 8 12:22:33 2008 @@ -22,9 +22,7 @@ --> <#if (parameters.validate?default(false) == false)><#rt/> <#if parameters.onsubmit??><#rt/> - ${tag.addParameter('onsubmit', "${parameters.onsubmit}; return true;") } - <#else> - ${tag.addParameter('onsubmit', "return true;") } + ${tag.addParameter('onsubmit', "${parameters.onsubmit}") } </#if> </#if> <form<#rt/> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-1.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="myAction" name="myForm" onsubmit="submitMe(); return true;" action="myAction" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"> +<form id="myAction" name="myForm" onsubmit="submitMe()" action="myAction" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-10.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="testNamespaceAction" name="myForm" onsubmit="submitMe(); return true;" action="/testNamespace/testNamespaceAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"> +<form id="testNamespaceAction" name="myForm" onsubmit="submitMe()" action="/testNamespace/testNamespaceAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-12.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="testAction" name="testAction" onsubmit="return true;" action="/testAction.action" method="post"> +<form id="testAction" name="testAction" action="/testAction.action" method="post"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-3.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="testNamespaceAction" name="myForm" onsubmit="return true;" action="/testNamespace/testNamespaceAction.action" method="post"> +<form id="testNamespaceAction" name="myForm" action="/testNamespace/testNamespaceAction.action" method="post"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-4.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="foo" onsubmit="return true;" action="/foo.jsp" method="post"> +<form id="foo" action="/foo.jsp" method="post"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-5.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="testNamespaceAction" name="myForm"onsubmit="return true;" action="/testNamespace/testNamespaceAction.jspa" method="post"> +<form id="testNamespaceAction" name="myForm" action="/testNamespace/testNamespaceAction.jspa" method="post"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-6.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="myAction" name="myForm" onsubmit="submitMe(); return true;" action="myAction" method="post" enctype="myEncType" title="mytitle"> +<form id="myAction" name="myForm" onsubmit="submitMe()" action="myAction" method="post" enctype="myEncType" title="mytitle"> <table class="wwFormTable"> <tr> <td class="tdLabel"></td> <td> <script type="text/javascript" src="/struts/optiontransferselect.js"></script> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-7.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="test" onsubmit="return true;" action="test.html" method="post"> +<form id="test" action="test.html" method="post"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-8.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="testNamespaceAction" name="myForm"onsubmit="return true;" action="/testNamespace/testNamespaceAction.jspa" method="post"> +<form id="testNamespaceAction" name="myForm" action="/testNamespace/testNamespaceAction.jspa" method="post"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-9.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="testAction" name="myForm" onsubmit="submitMe(); return true;" action="/testAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"> +<form id="testAction" name="myForm" onsubmit="submitMe()" action="/testAction.action" method="post" enctype="myEncType" title="mytitle" accept-charset="UTF-8"> <table class="wwFormTable"> </table> </form> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-1.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="post"> +<form id="myFormId" name="myForm" action="/testAction.action" method="post"> <tableclass="wwFormTable"> <tr> <td class="tdLabel"> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-2.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="post"> +<form id="myFormId" name="myForm" action="/testAction.action" method="post"> <tableclass="wwFormTable"> <tr> <td class="tdLabel"> Modified: struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt?rev=724471&r1=724470&r2=724471&view=diff ============================================================================== --- struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt (original) +++ struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/tooltip-3.txt Mon Dec 8 12:22:33 2008 @@ -1,4 +1,4 @@ -<form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="post"> +<form id="myFormId" name="myForm" action="/testAction.action" method="post"> <tableclass="wwFormTable"> <tr> <td class="tdLabel">