Author: nbelaevski
Date: 2010-11-18 11:20:00 -0500 (Thu, 18 Nov 2010)
New Revision: 20094
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:17:55 UTC (rev 20093)
+++
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js 2010-11-18
16:20:00 UTC (rev 20094)
@@ -67,8 +67,8 @@
});
},
- __getHandles: function() {
- return this.__rootElt.find(" > .rf-trn:first > .rf-trn-hnd");
+ __getHandle: function() {
+ return this.__rootElt.find(" > .rf-trn:first > .rf-trn-hnd:first");
},
__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:17:55 UTC
(rev 20093)
+++ trunk/ui/iteration/ui/src/main/templates/treeNode.template.xml 2010-11-18 16:20:00 UTC
(rev 20094)
@@ -19,19 +19,11 @@
<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>