Modified: struts/struts2/trunk/core/src/site/resources/tags/radio.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/radio.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/radio.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/radio.html Mon Apr 9 16:47:21 2007 @@ -68,6 +68,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -305,7 +313,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">value</td>
Modified: struts/struts2/trunk/core/src/site/resources/tags/reset.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/reset.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/reset.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/reset.html Mon Apr 9 16:47:21 2007 @@ -84,6 +84,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -305,7 +313,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">type</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/select.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/select.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/select.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/select.html Mon Apr 9 16:47:21 2007 @@ -92,6 +92,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -345,7 +353,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">value</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/submit.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/submit.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/submit.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/submit.html Mon Apr 9 16:47:21 2007 @@ -84,6 +84,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -313,7 +321,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">type</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/table.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/table.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/table.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/table.html Mon Apr 9 16:47:21 2007 @@ -68,6 +68,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -305,7 +313,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">value</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/textarea.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/textarea.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/textarea.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/textarea.html Mon Apr 9 16:47:21 2007 @@ -76,6 +76,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -305,7 +313,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">value</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/textfield.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/textfield.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/textfield.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/textfield.html Mon Apr 9 16:47:21 2007 @@ -68,6 +68,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -313,7 +321,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">value</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/token.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/token.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/token.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/token.html Mon Apr 9 16:47:21 2007 @@ -68,6 +68,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -281,7 +289,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">value</td> Modified: struts/struts2/trunk/core/src/site/resources/tags/updownselect.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/updownselect.html?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/site/resources/tags/updownselect.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/updownselect.html Mon Apr 9 16:47:21 2007 @@ -116,6 +116,14 @@ <td align="left" valign="top">id for referencing element. For UI and form tags it will be used as HTML id attribute</td> </tr> <tr> + <td align="left" valign="top">javascriptTooltip</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">Boolean</td> + <td align="left" valign="top">Use JavaScript to generate tooltips</td> + </tr> + <tr> <td align="left" valign="top">key</td> <td align="left" valign="top">false</td> <td align="left" valign="top"></td> @@ -393,7 +401,31 @@ <td align="left" valign="top"></td> <td align="left" valign="top">true</td> <td align="left" valign="top">String</td> - <td align="left" valign="top">Set the tooltip configuration</td> + <td align="left" valign="top">Deprecated. Use individual tooltip configuration attributes instead.</td> + </tr> + <tr> + <td align="left" valign="top">tooltipCssClass</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">StrutsTTClassic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">CSS class applied to JavaScrip tooltips</td> + </tr> + <tr> + <td align="left" valign="top">tooltipDelay</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top">Classic</td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Delay in milliseconds, before showing JavaScript tooltips </td> + </tr> + <tr> + <td align="left" valign="top">tooltipIconPath</td> + <td align="left" valign="top">false</td> + <td align="left" valign="top"></td> + <td align="left" valign="top">true</td> + <td align="left" valign="top">String</td> + <td align="left" valign="top">Icon path used for image that will have the tooltip</td> </tr> <tr> <td align="left" valign="top">value</td> Modified: struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java (original) +++ struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/TooltipTest.java Mon Apr 9 16:47:21 2007 @@ -67,6 +67,38 @@ verify(TooltipTest.class.getResource("tooltip-1.txt")); } + + public void testWithoutFormOverridingNew() throws Exception { + + // we test it on textfield component, but since the tooltip are common to + // all components, it will be the same for other components as well. + FormTag formTag = new FormTag(); + formTag.setPageContext(pageContext); + formTag.setId("myFormId"); + formTag.setAction("testAction"); + formTag.setName("myForm"); + + + TextFieldTag tag = new TextFieldTag(); + tag.setPageContext(pageContext); + tag.setLabel("MyLabel"); + tag.setId("myId"); + + + //same parameters as the OGNL map configuration, output must be the same + tag.setTooltip("myTooltip"); + tag.setTooltipIconPath("/struts/tooltip/myTooltip.gif"); + tag.setTooltipDelay("500"); + tag.setJavascriptTooltip("true"); + + + formTag.doStartTag(); + tag.doStartTag(); + tag.doEndTag(); + formTag.doEndTag(); + + verify(TooltipTest.class.getResource("tooltip-1.txt")); + } public void testWithFormOverriding() throws Exception { @@ -99,6 +131,36 @@ verify(TooltipTest.class.getResource("tooltip-2.txt")); } + + public void testWithFormOverridingNew() throws Exception { + + FormTag formTag = new FormTag(); + formTag.setPageContext(pageContext); + formTag.setName("myForm"); + formTag.setId("myFormId"); + formTag.setAction("testAction"); + + // same parameters as the OGNL map configuration, output must be the same + formTag.setTooltip("myTooltip"); + formTag.setTooltipIconPath("/struts/tooltip/myTooltip.gif"); + formTag.setTooltipDelay("500"); + formTag.setJavascriptTooltip("true"); + + + TextFieldTag tag = new TextFieldTag(); + tag.setPageContext(pageContext); + tag.setLabel("MyLabel"); + tag.setId("myId"); + + tag.setTooltip("myTooltip"); + + formTag.doStartTag(); + tag.doStartTag(); + tag.doEndTag(); + formTag.doEndTag(); + + verify(TooltipTest.class.getResource("tooltip-2.txt")); + } public void testWithPartialFormOverriding() throws Exception { @@ -138,6 +200,40 @@ verify(TooltipTest.class.getResource("tooltip-3.txt")); } + public void testWithPartialFormOverridingNew() throws Exception { + + FormTag formTag = new FormTag(); + formTag.setName("myForm"); + formTag.setPageContext(pageContext); + formTag.setId("myFormId"); + formTag.setAction("testAction"); + + // same parameters as the OGNL map configuration, output must be the same + formTag.setTooltip("myTooltip"); + formTag.setTooltipIconPath("/struts/tooltip/myTooltip.gif"); + formTag.setTooltipDelay("500"); + formTag.setJavascriptTooltip("true"); + + + TextFieldTag tag = new TextFieldTag(); + tag.setPageContext(pageContext); + tag.setLabel("MyLabel"); + tag.setId("myId"); + + + //same parameters as the OGNL map configuration, output must be the same + tag.setTooltip("myTooltip"); + tag.setTooltipIconPath("/struts/tooltip/myTooltip2.gif"); + tag.setTooltipDelay("5000"); + tag.setJavascriptTooltip("true"); + + formTag.doStartTag(); + tag.doStartTag(); + tag.doEndTag(); + formTag.doEndTag(); + + verify(TooltipTest.class.getResource("tooltip-3.txt")); + } public void testUsingParamValueToSetConfigurations() throws Exception { FormTag formTag = new FormTag(); 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?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- 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 Apr 9 16:47:21 2007 @@ -1,22 +1,22 @@ <form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="POST"> - <table class="wwFormTable"> -<tr> - <td class="tdLabel"><label for="myId" class="label">MyLabel: - <img id="_tt1507188919" - src='/struts/tooltip/myTooltip.gif' - alt="myTooltip" - title="myTooltip" /> - - <span dojoType="tooltip" connectId="_tt1507188919" delay="500" - caption="myTooltip"></span> - </label></td> - <td><input type="text" name="" id="myId"/></td> -</tr> -</table> + <tableclass="wwFormTable"> + <tr> + <td class="tdLabel"> + <labelfor="myId"class="label"> + MyLabel:<img + src='/struts/tooltip/myTooltip.gif' + alt="myTooltip" + onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/> + </label> + </td> + <td> + <input type="text" name="" id="myId"/> + </td> + </tr> + </table> </form> - -<!-- javascript that is needed for tooltips --> -<script type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script> - +<!--javascript that is needed for tooltips--> +<script type="text/javascript" language="javascript" src='/struts/domTT.js'></script> +<link rel="stylesheet" type="text/css" href="/struts/domTT.css"/> 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?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- 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 Apr 9 16:47:21 2007 @@ -1,19 +1,19 @@ <form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="POST"> - <table class="wwFormTable"> -<tr> - <td class="tdLabel"><label for="myId" class="label">MyLabel: - <img id="_tt1507188919" - src='/struts/tooltip/myTooltip.gif' - alt="myTooltip" - title="myTooltip" /> - - <span dojoType="tooltip" connectId="_tt1507188919" delay="500" - caption="myTooltip"></span> - </label></td> - <td><input type="text" name="" id="myId"/></td> -</tr> -</table> + <tableclass="wwFormTable"> + <tr> + <td class="tdLabel"> + <labelfor="myId"class="label"> + MyLabel:<img + src='/struts/tooltip/myTooltip.gif' + alt="myTooltip" onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/> + </label> + </td> + <td> + <input type="text" name="" id="myId"/> + </td> + </tr> + </table> </form> - -<!-- javascript that is needed for tooltips --> -<script type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script> +<!--javascript that is needed for tooltips--> +<script type="text/javascript" language="javascript" src='/struts/domTT.js'></script> +<link rel="stylesheet" type="text/css" href="/struts/domTT.css"/> \ No newline at end of file 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?view=diff&rev=526959&r1=526958&r2=526959 ============================================================================== --- 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 Apr 9 16:47:21 2007 @@ -1,20 +1,22 @@ <form id="myFormId" name="myForm" onsubmit="return true;" action="/testAction.action" method="POST"> - <table class="wwFormTable"> -<tr> - <td class="tdLabel"><label for="myId" class="label">MyLabel: - <img id="_tt1507188919" - src='/struts/tooltip/myTooltip2.gif' - alt="myTooltip" - title="myTooltip" /> - - <span dojoType="tooltip" connectId="_tt1507188919" delay="5000" - caption="myTooltip"></span> - </label></td> - <td><input type="text" name="" id="myId"/></td> -</tr> -</table> + <tableclass="wwFormTable"> + <tr> + <td class="tdLabel"> + <labelfor="myId"class="label"> + MyLabel:<img + src='/struts/tooltip/myTooltip2.gif' + alt="myTooltip" + onmouseover="domTT_activate(this,event,'content','myTooltip','delay','5000','styleClass','StrutsTTClassic')"/> + </label> + </td> + <td> + <input type="text" name="" id="myId"/> + </td> + </tr> + </table> </form> -<!-- javascript that is needed for tooltips --> -<script type="text/javascript">dojo.require("dojo.widget.html.Tooltip");dojo.require("dojo.fx.html");</script> +<!--javascript that is needed for tooltips--> +<script type="text/javascript" language="javascript" src='/struts/domTT.js'></script> +<link rel="stylesheet" type="text/css" href="/struts/domTT.css"/>
