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

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

Author: a.izobov
Date: 2007-04-06 10:50:38 -0400 (Fri, 06 Apr 2007)
New Revision: 310

Modified:
   trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java
   trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
Log:
menuGroup template development

Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java
===================================================================
--- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java	2007-04-06 14:45:47 UTC (rev 309)
+++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/MenuGroupRendererBase.java	2007-04-06 14:50:38 UTC (rev 310)
@@ -21,13 +21,6 @@
 
 package org.richfaces.renderkit.html;
 
-import java.io.IOException;
-
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-
-import org.ajax4jsf.framework.renderer.ComponentVariables;
-import org.ajax4jsf.framework.renderer.ComponentsVariableResolver;
 import org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase;
 import org.richfaces.component.UIMenuGroup;
 
@@ -43,31 +36,4 @@
 		return true;
 	}
 	
-	public void initializeResources(FacesContext context, UIMenuGroup menuGroup)
-		throws IOException {
-
-		ComponentVariables variables = ComponentsVariableResolver.getVariables(this, menuGroup);
-	
-		boolean disabled = ((Boolean) menuGroup.getAttributes().get("disabled")).booleanValue();
-		if (!disabled) {			
-			StringBuffer scriptValue = new StringBuffer();
-			scriptValue.append("document.getElementById('ref" + menuGroup.getClientId(context) + ":icon').className='dr-menu-icon rich-menu-item-icon ")
-				.append(getAttributeOrEmpty(menuGroup, "iconClass") + "'; ")				
-				.append("document.getElementById('ref" + menuGroup.getClientId(context) + ":anchor').className='dr-menu-label rich-menu-item-label'; ");
-			variables.setVariable("onmouseout", scriptValue);
-			
-			scriptValue = new StringBuffer();
-			scriptValue.append("document.getElementById('ref" + menuGroup.getClientId(context) + ":icon').className='dr-menu-icon dr-menu-icon-selected rich-menu-item-icon rich-menu-item-icon-selected ")
-				.append(getAttributeOrEmpty(menuGroup, "iconClass") + "'; ")				
-				.append("document.getElementById('ref" + menuGroup.getClientId(context) + ":anchor').className='dr-menu-label dr-menu-label-selected rich-menu-item-label rich-menu-item-label-selected'; ");
-			variables.setVariable("onmouseover", scriptValue);
-			
-		}		
-	}
-
-	public String getAttributeOrEmpty(UIComponent component, String attr) {
-		Object value = component.getAttributes().get(attr);
-		return value==null?"":value.toString(); 
-	}
-	
 }

Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx
===================================================================
--- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx	2007-04-06 14:45:47 UTC (rev 309)
+++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx	2007-04-06 14:50:38 UTC (rev 310)
@@ -14,12 +14,9 @@
 	
    	<h:scripts>
 			new org.ajax4jsf.framework.resource.PrototypeScript(),
-			new org.ajax4jsf.framework.ajax.AjaxScript(),
-			scripts/menu.js			
+			new org.ajax4jsf.framework.ajax.AjaxScript()
 	</h:scripts>
 
-	<f:call name="initializeResources" />
-	
 	<f:clientid var="clientId"/>
 	<f:resource name="/org/richfaces/renderkit/html/images/spacer.gif" var="spacer" />
 	
@@ -30,8 +27,14 @@
 			<div id="ref#{clientId}" 
 				class="dr-menu-item dr-menu-item-enabled rich-menu-group #{component.attributes['styleClass']}" 
 				style="#{component.attributes['style']}"
-				onmouseout="this.className='dr-menu-item dr-menu-item-enabled rich-menu-group'; #{onmouseout} #{component.attributes['onmouseout']}" 
-				onmouseover="this.className='dr-menu-item dr-menu-item-hover rich-menu-group rich-menu-group-hover'; #{component.attributes['selectClass']} #{onmouseover} #{component.attributes['onmouseover']}"
+				onmouseout="this.className='dr-menu-item dr-menu-item-enabled rich-menu-group'; 
+					$('ref#{clientId}:icon').className='dr-menu-icon rich-menu-item-icon #{component.attributes['iconClass']}';
+					$('ref#{clientId}:anchor').className='dr-menu-label rich-menu-item-label';
+					 #{component.attributes['onmouseout']}" 
+				onmouseover="this.className='dr-menu-item dr-menu-item-hover rich-menu-group rich-menu-group-hover'; #{component.attributes['selectClass']} 
+					$('ref#{clientId}:icon').className='dr-menu-icon dr-menu-icon-selected rich-menu-item-icon rich-menu-item-icon-selected #{component.attributes['iconClass']}';
+					$('ref#{clientId}:anchor').className='dr-menu-label dr-menu-label-selected rich-menu-item-label rich-menu-item-label-selected';
+					#{component.attributes['onmouseover']}"
 				onmousemove="#{component.attributes['onmousemove']}">
 				
 				<span id="ref#{clientId}:icon"