Author: husted
Date: Thu Aug 31 20:20:45 2006
New Revision: 439153
URL: http://svn.apache.org/viewvc?rev=439153&view=rev
Log:
WW-1425 The form tag is generating incomplete and/or unnecessary references to
dojo, reported by Matt Raible
Add if clause to check parameter and update affected tests.
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
struts/struts2/trunk/core/src/main/resources/template/simple/form.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-11.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.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
Modified:
struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl?rev=439153&r1=439152&r2=439153&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form-close.ftl
Thu Aug 31 20:20:45 2006
@@ -68,5 +68,7 @@
<#--
Code that will add javascript needed for tooltips
--><#t/>
+<#if (parameters.hasTooltip?default(false))><#t/>
<#lt/><!-- javascript that is needed for tooltips -->
<#lt/><script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
+</#if><#t/>
Modified: struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl?rev=439153&r1=439152&r2=439153&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl
(original)
+++ struts/struts2/trunk/core/src/main/resources/template/simple/form.ftl Thu
Aug 31 20:20:45 2006
@@ -26,7 +26,8 @@
</#if>
<#if parameters.method?exists>
method="${parameters.method?html}"<#rt/>
-<#else>method="POST"<#rt/>
+<#else>
+ method="POST"<#rt/>
</#if>
<#if parameters.enctype?exists>
enctype="${parameters.enctype?html}"<#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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,6 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,6 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt?rev=439153&r1=439152&r2=439153&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-11.txt
Thu Aug 31 20:20:45 2006
@@ -28,7 +28,3 @@
selectAllOptionsExceptSome(updownselectObj,
"key", "");
});
</script>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
Modified:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt?rev=439153&r1=439152&r2=439153&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
(original)
+++
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Formtag-2.txt
Thu Aug 31 20:20:45 2006
@@ -29,9 +29,6 @@
});
</script>
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
<script>
function validateForm_myAction() {
form = document.getElementById("myAction");
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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,7 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,7 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,7 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -27,7 +27,3 @@
selectAllOptionsExceptSome(updownselectObj,
"key", "");
});
</script>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,7 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,7 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
-
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=439153&r1=439152&r2=439153&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
Thu Aug 31 20:20:45 2006
@@ -2,6 +2,3 @@
<table class="wwFormTable">
</table>
</form>
-
-<!-- javascript that is needed for tooltips -->
-<script language="JavaScript"
type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script>
