[richfaces-svn-commits] JBoss Rich Faces SVN: r20093 - in trunk/ui/iteration/ui/src/main: templates and 1 other directory.
Author: nbelaevski
Date: 2010-11-18 11:17:55 -0500 (Thu, 18 Nov 2010)
New Revision: 20093
Modified:
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js
trunk/ui/iteration/ui/src/main/templates/treeNode.template.xml
Log:
https://jira.jboss.org/browse/RF-9715
Modified:
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js
===================================================================
---
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js 2010-11-18
16:15:48 UTC (rev 20092)
+++
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js 2010-11-18
16:17:55 UTC (rev 20093)
@@ -67,8 +67,8 @@
});
},
- __getHandle: function() {
- return this.__rootElt.find(" > .rf-trn:first > .rf-trn-hnd:first");
+ __getHandles: function() {
+ return this.__rootElt.find(" > .rf-trn:first > .rf-trn-hnd");
},
__getContent: function() {
Modified: trunk/ui/iteration/ui/src/main/templates/treeNode.template.xml
===================================================================
--- trunk/ui/iteration/ui/src/main/templates/treeNode.template.xml 2010-11-18 16:15:48 UTC
(rev 20092)
+++ trunk/ui/iteration/ui/src/main/templates/treeNode.template.xml 2010-11-18 16:17:55 UTC
(rev 20093)
@@ -19,11 +19,19 @@
<cdk:object name="nodeState"
value="#{getNodeState(facesContext)}"
type="org.richfaces.renderkit.TreeNodeState" />
<div class="#{concatClasses('rf-trn',
component.attributes['styleClass'])}">
+<<<<<<< HEAD
<span class="#{concatClasses(nodeState.handleClass,
component.attributes['handleClass'])}"></span>
<span class="rf-trn-cnt">
<cdk:call expression="encodeIcon(facesContext, component)"
/>
<span class="#{concatClasses('rf-trn-lbl',
component.attributes['labelClass'])}">
+=======
+ <cdk:call expression="encodeHandle(facesContext, component)"
/>
+
+ <span class="rf-trn-cnt">
+ <span class="rf-trn-ico #{nodeState.iconClass}" />
+ <span class="rf-trn-lbl">
+>>>>>>> https://jira.jboss.org/browse/RF-9715
<cdk:body />
</span>
</span>