struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From musa...@apache.org
Subject svn commit: r676628 - in /struts/struts2/trunk/core/src: main/resources/template/xhtml/ test/resources/org/apache/struts2/views/jsp/ui/
Date Mon, 14 Jul 2008 15:48:19 GMT
Author: musachy
Date: Mon Jul 14 08:48:17 2008
New Revision: 676628

URL: http://svn.apache.org/viewvc?rev=676628&view=rev
Log:
WW-1892 Two tooltips are displayed on IE 7 when using javascript tooltips

Thanks to Jose Ignacio Gil Jaldo  for the patch.

Modified:
    struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl
    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/xhtml/tooltip.ftl
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl?rev=676628&r1=676627&r2=676628&view=diff
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl (original)
+++ struts/struts2/trunk/core/src/main/resources/template/xhtml/tooltip.ftl Mon Jul 14 08:48:17
2008
@@ -21,15 +21,14 @@
  */
 -->
 <#if parameters.tooltip?exists><#t/>
-      <img 
+      <img
       <#if parameters.tooltipIconPath?exists><#t/>
       	src='<@s.url value="${parameters.tooltipIconPath}" includeParams="none" encode="false"
/>'
       <#else><#t/>
       	src='<@s.url value="/struts/tooltip.gif" includeParams="none" encode="false" />'
       </#if><#t/>
-      alt="${parameters.tooltip?html}" 
       <#if parameters.jsTooltipEnabled?default('false') == 'true'>
-          onmouseover="domTT_activate(this, event, 'content', '${parameters.tooltip}'<#t/>

+          onmouseover="domTT_activate(this, event, 'content', '${parameters.tooltip}'<#t/>
           <#if parameters.tooltipDelay?exists><#t/>
           	<#t/>,'delay', '${parameters.tooltipDelay}'<#t/>
           </#if><#t/>
@@ -37,5 +36,6 @@
           <#t/>)" />
       <#else>
       	title="${parameters.tooltip?html}"/>
+      	alt="${parameters.tooltip?html}"
      </#if>
 </#if><#t/>

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=676628&r1=676627&r2=676628&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 Jul 14 08:48:17 2008
@@ -3,9 +3,8 @@
 		<tr>
 			<td class="tdLabel">
 				<labelfor="myId"class="label">
-					MyLabel:<img 
+					MyLabel:<img
 								src='/struts/tooltip/myTooltip.gif'
-								alt="myTooltip" 
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/>
 				</label>
 			</td>

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=676628&r1=676627&r2=676628&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 Jul 14 08:48:17 2008
@@ -3,9 +3,9 @@
 		<tr>
 			<td class="tdLabel">
 				<labelfor="myId"class="label">
-					MyLabel:<img 
+					MyLabel:<img
 								src='/struts/tooltip/myTooltip.gif'
-								alt="myTooltip" onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/>
+								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','500','styleClass','StrutsTTClassic')"/>
 				</label>
 			</td>
 			<td>

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=676628&r1=676627&r2=676628&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 Jul 14 08:48:17 2008
@@ -3,9 +3,8 @@
 		<tr>
 			<td class="tdLabel">
 				<labelfor="myId"class="label">
-					MyLabel:<img 
+					MyLabel:<img
 								src='/struts/tooltip/myTooltip2.gif'
-								alt="myTooltip"
 								onmouseover="domTT_activate(this,event,'content','myTooltip','delay','5000','styleClass','StrutsTTClassic')"/>
 				</label>
 			</td>



Mime
View raw message