[richfaces-svn-commits] JBoss Rich Faces SVN: r12029 - trunk/ui/tree/src/main/templates.

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

Author: nbelaevski
Date: 2008-12-24 19:32:47 -0500 (Wed, 24 Dec 2008)
New Revision: 12029

Modified:
   trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
Log:
https://jira.jboss.org/jira/browse/RF-5464

Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx	2008-12-25 00:04:10 UTC (rev 12028)
+++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx	2008-12-25 00:32:47 UTC (rev 12029)
@@ -23,18 +23,20 @@
 		var="expanded" />
 	<f:resource
 		name="images/iconFolder.gif"
-		var="folder" />
+		var="folderIcon" />
 	<f:resource
 		name="images/iconLeaf.gif"
-		var="leaf" />
+		var="leafIcon" />
 
 	<f:call name="initializeLines" />
 	<f:call name="initializeResources" />
 
+	<c:object var="leaf" type="boolean" value="#{component.UITree.leaf}" />
+
 	<table border="0" cellpadding="0" cellspacing="0" id="#{clientId}" class="dr-tree-full-width rich-tree-node">
 	<tbody>
 
-	<tr id="#{clientId}:mainRow" onclick="#{component.attributes['onclick']} #{this:getToggleScript(context, component, 'mainRow')}" >
+	<tr id="#{clientId}:mainRow" onclick="#{component.attributes['onclick']} #{!leaf ? this:getToggleScript(context, component, 'mainRow') : ''}" >
 		<f:call name="encodeAttributeParameters" />
 		
 		<f:call name="utils.encodePassThruWithExclusions">
@@ -56,7 +58,6 @@
 			<div>
 				<jsp:scriptlet>
 					<![CDATA[
-					    boolean leaf = component.getUITree().isLeaf();
 						if (leaf) {
 					]]>
 				</jsp:scriptlet>
@@ -196,7 +197,7 @@
 					} else {
 				]]>
 			</jsp:scriptlet>
-						<img src="#{leaf}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" />
+						<img src="#{leafIcon}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" />
 			<jsp:scriptlet>
 				<![CDATA[
 					}
@@ -221,7 +222,7 @@
 					} else {
 				]]>
 			</jsp:scriptlet>
-						<img src="#{folder}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" />
+						<img src="#{folderIcon}" alt="" class="dr-tree-h-ic-img-md dr-tree-h-ic-img" />
 			<jsp:scriptlet>
 				<![CDATA[
 					}