[richfaces-svn-commits] JBoss Rich Faces SVN: r14429 - in branches/community/3.3.X/ui/dropdown-menu/src: test/java/org/richfaces/component and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: konstantin.mishin
Date: 2009-06-02 05:00:19 -0400 (Tue, 02 Jun 2009)
New Revision: 14429

Modified:
   branches/community/3.3.X/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
   branches/community/3.3.X/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
Log:
RF-7295

Modified: branches/community/3.3.X/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- branches/community/3.3.X/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx	2009-06-02 08:52:36 UTC (rev 14428)
+++ branches/community/3.3.X/ui/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx	2009-06-02 09:00:19 UTC (rev 14429)
@@ -18,7 +18,7 @@
     			if (!menu.isDisabled()) {]]>
     </jsp:scriptlet>
 	<div id="#{clientId}" style="#{component.attributes['style']}"
-		class="dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect #{component.attributes['styleClass']} #{component.attributes['labelClass']}"
+		class="rich-ddmenu-label rich-ddmenu-label-unselect #{component.attributes['styleClass']} #{component.attributes['labelClass']}"
 		onmouseover="#{component.attributes['onmouseover']}"
 		onmouseout="#{component.attributes['onmouseout']}"
 		onmousemove="#{component.attributes['onmousemove']}">
@@ -26,20 +26,20 @@
 		<![CDATA[ } else { ]]> 
 	</jsp:scriptlet>
 	<div id="#{clientId}" style="#{component.attributes['style']}"
-		class="dr-menu-label dr-menu-label-unselect dr-ddmenu-label-disabled rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']} #{component.attributes['disabledLabelClass']}"
+		class="rich-ddmenu-label-disabled rich-ddmenu-label-unselect #{component.attributes['styleClass']} #{component.attributes['disabledLabelClass']}"
 		onmouseover="#{component.attributes['onmouseover']}"
 		onmouseout="#{component.attributes['onmouseout']}"
 		onmousemove="#{component.attributes['onmousemove']}">
 	<jsp:scriptlet>
 		<![CDATA[ } if (menu.isDisabled() &&
 			(component.getFacet("labelDisabled")!=null && component.getFacet("labelDisabled").isRendered())) {]]>
-	</jsp:scriptlet> <div class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
+	</jsp:scriptlet> <div class="rich-label-text-decor"> <u:insertFacet
 		name="labelDisabled" /> </div> <jsp:scriptlet>			
 			<![CDATA[} else if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
-		 </jsp:scriptlet> <div class="dr-label-text-decor rich-label-text-decor"> <u:insertFacet
+		 </jsp:scriptlet> <div class="rich-label-text-decor"> <u:insertFacet
 		name="label" /> </div> <jsp:scriptlet>	
 					<![CDATA[} else {]]> 
-		</jsp:scriptlet> <div id="#{clientId}_span" class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</div>
+		</jsp:scriptlet> <div id="#{clientId}_span" class="rich-label-text-decor">#{component.attributes['value']}</div>
 	<jsp:scriptlet>	
 					<![CDATA[}]]> 
 		</jsp:scriptlet>

Modified: branches/community/3.3.X/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java
===================================================================
--- branches/community/3.3.X/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java	2009-06-02 08:52:36 UTC (rev 14428)
+++ branches/community/3.3.X/ui/dropdown-menu/src/test/java/org/richfaces/component/DropDownMenuComponentTest.java	2009-06-02 09:00:19 UTC (rev 14429)
@@ -151,8 +151,6 @@
         assertNotNull(div);
         assertEquals("div", div.getNodeName());
         String classAttr = div.getAttributeValue("class");
-        assertTrue(classAttr.contains("dr-menu-label"));
-        assertTrue(classAttr.contains("dr-menu-label-unselect"));
         assertTrue(classAttr.contains("rich-ddmenu-label"));
         assertTrue(classAttr.contains("rich-ddmenu-label-unselect"));
         assertTrue(classAttr.contains("myclass"));