[richfaces-svn-commits] JBoss Rich Faces SVN: r617 - in trunk/richfaces/dropdown-menu/src/main: templates/org/richfaces and 1 other directory.

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

Author: nbelaevski
Date: 2007-05-02 20:12:34 -0400 (Wed, 02 May 2007)
New Revision: 617

Modified:
   trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
   trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
Log:
Back to original markup

Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js	2007-05-02 22:16:54 UTC (rev 616)
+++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js	2007-05-03 00:12:34 UTC (rev 617)
@@ -664,7 +664,7 @@
 		         Exadel.Menu.Layers.clearLMTO();
 		         
 		         var menuNode = this.layer.parentNode;
-		         $(menuNode.id + 'Label').className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select';
+		         menuNode.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select';
 				
 		         Event.stop(e);
 	       }.bindAsEventListener(this);
@@ -676,7 +676,7 @@
 			         Exadel.Menu.Layers.setLMTO(this.hideDelay);
 		          }
 			         var menuNode = this.layer.parentNode;
-			         $(menuNode.id + 'Label').className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect';
+			         menuNode.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect';
 				
 		          Event.stop(e);
 	         }.bindAsEventListener(this);

Modified: trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx
===================================================================
--- trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx	2007-05-02 22:16:54 UTC (rev 616)
+++ trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx	2007-05-03 00:12:34 UTC (rev 617)
@@ -21,28 +21,26 @@
     <jsp:scriptlet>
 		<![CDATA[org.richfaces.component.util.FormUtil.throwEnclFormReqExceptionIfNeed(context,component);]]>		                                               
     </jsp:scriptlet>	
-    <div id="#{clientId}" class="#{component.attributes['styleClass']}"
-         style="position: relative; #{component.attributes['style']};" 
-	     onmouseover="$('#{clientId}Label').className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}" 
-       	 onmouseout="$('#{clientId}Label').className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"         
+    <div id="#{clientId}"
+         style="#{component.attributes['style']};" 
+  		 class="#{component.attributes['styleClass']} dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
+	     onmouseover="this.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select' ; #{component.attributes['onmouseover']}" 
+       	 onmouseout="this.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; #{component.attributes['onmouseout']}"         
          onmousemove="#{component.attributes['onmousemove']}">
 
-		<div id="#{clientId}Label" class="dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect"
-		>
-			 <jsp:scriptlet>
-						<![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
-			 </jsp:scriptlet>
-			    <span class="dr-label-text-decor rich-label-text-decor">
-				           <u:insertFacet name="label" />
-				</span>
-			<jsp:scriptlet>	
-						<![CDATA[} else {]]> 
-			</jsp:scriptlet>         
-	            <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>             
-			<jsp:scriptlet>	
-						<![CDATA[}]]> 
-			</jsp:scriptlet>         
-		</div>
+		 <jsp:scriptlet>
+					<![CDATA[if(component.getFacet("label")!=null && component.getFacet("label").isRendered()) {]]>
+		 </jsp:scriptlet>
+		    <span class="dr-label-text-decor rich-label-text-decor">
+			           <u:insertFacet name="label" />
+			</span>
+		<jsp:scriptlet>	
+					<![CDATA[} else {]]> 
+		</jsp:scriptlet>         
+            <span class="dr-label-text-decor rich-label-text-decor">#{component.attributes['value']}</span>             
+		<jsp:scriptlet>	
+					<![CDATA[}]]> 
+		</jsp:scriptlet>         
 
 		<vcp:body>
 			<f:call name="renderChildren" />