[richfaces-svn-commits] JBoss Rich Faces SVN: r1133 - in trunk/richfaces/tree/src/main: templates and 1 other directory.

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

Author: sergeyhalipov
Date: 2007-06-12 08:45:24 -0400 (Tue, 12 Jun 2007)
New Revision: 1133

Modified:
   trunk/richfaces/tree/src/main/config/component/tree.xml
   trunk/richfaces/tree/src/main/config/component/treeNode.xml
   trunk/richfaces/tree/src/main/templates/htmlTree.jspx
   trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
Log:
http://jira.jboss.com/jira/browse/RF-214

Modified: trunk/richfaces/tree/src/main/config/component/tree.xml
===================================================================
--- trunk/richfaces/tree/src/main/config/component/tree.xml	2007-06-12 10:58:40 UTC (rev 1132)
+++ trunk/richfaces/tree/src/main/config/component/tree.xml	2007-06-12 12:45:24 UTC (rev 1133)
@@ -52,7 +52,8 @@
 		</property>
 		&ui_component_attributes;
 		&html_style_attributes;
-
+		&html_events;
+		
 		<property>
 			<name>stateVar</name>
 			<classname>java.lang.String</classname>

Modified: trunk/richfaces/tree/src/main/config/component/treeNode.xml
===================================================================
--- trunk/richfaces/tree/src/main/config/component/treeNode.xml	2007-06-12 10:58:40 UTC (rev 1132)
+++ trunk/richfaces/tree/src/main/config/component/treeNode.xml	2007-06-12 12:45:24 UTC (rev 1133)
@@ -106,7 +106,9 @@
 
         <property hidden="true">
         	<name>dropValue</name>        	
-        </property>
+        </property>
+        
+        &html_events;
     </component>
 	&listeners;
 </components>

Modified: trunk/richfaces/tree/src/main/templates/htmlTree.jspx
===================================================================
--- trunk/richfaces/tree/src/main/templates/htmlTree.jspx	2007-06-12 10:58:40 UTC (rev 1132)
+++ trunk/richfaces/tree/src/main/templates/htmlTree.jspx	2007-06-12 12:45:24 UTC (rev 1133)
@@ -38,7 +38,11 @@
 		
 	<f:call name="encodeAttributeParameters" />
 
-	<f:call name="writeNamespace" />
+	<f:call name="writeNamespace" />
+	
+	<f:call name="utils.encodePassThruWithExclusions">
+        <f:parameter value="id,style,class"/>
+    </f:call>
 
 	<table width="100%" cellpadding="0">
 		<tbody>

Modified: trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx	2007-06-12 10:58:40 UTC (rev 1132)
+++ trunk/richfaces/tree/src/main/templates/htmlTreeNode.jspx	2007-06-12 12:45:24 UTC (rev 1133)
@@ -31,8 +31,12 @@
 	<f:call name="initializeLines" />
 	<f:call name="initializeResources" />
 
-	<tr id="#{clientId}:mainRow" onclick="#{this:getToggleScript(context, component, 'mainRow')} return false;" >
-		<f:call name="encodeAttributeParameters" />
+	<tr id="#{clientId}:mainRow" onclick="#{component.attributes['onclick']}; #{this:getToggleScript(context, component, 'mainRow')} return false;" >
+		<f:call name="encodeAttributeParameters" />
+		
+		<f:call name="utils.encodePassThruWithExclusions">
+	        <f:parameter value="id,onclick"/>
+	    </f:call>
 		<td class="dr-tree-h-ic #{line}">
 			<div>
 				<jsp:scriptlet>