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. git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@439153 13f79535-47bb-0310-9956-ffa450edef68
2026-08-11 01:27:14 +00:00 · 2006-09-01 03:20:45 +00:00
parent 37f20fcd23
commit 921234536f
13 changed files with 4 additions and 41 deletions
@@ -68,5 +68,7 @@ dojo.require("dojo.event.connect");
 <#-- 
 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/>
@@ -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/>
@@ -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>
@@ -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>
@@ -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>
-
@@ -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");
@@ -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>
-
@@ -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>
-
@@ -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>
-
@@ -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>
-
@@ -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>
-
@@ -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>
-
@@ -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>