Author: nbelaevski
Date: 2010-11-18 11:26:56 -0500 (Thu, 18 Nov 2010)
New Revision: 20097
Modified:
trunk/examples/iteration-demo/src/main/webapp/tree.xhtml
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js
Log:
https://jira.jboss.org/browse/RF-9715
Modified: trunk/examples/iteration-demo/src/main/webapp/tree.xhtml
===================================================================
--- trunk/examples/iteration-demo/src/main/webapp/tree.xhtml 2010-11-18 16:24:23 UTC (rev
20096)
+++ trunk/examples/iteration-demo/src/main/webapp/tree.xhtml 2010-11-18 16:26:56 UTC (rev
20097)
@@ -74,27 +74,18 @@
</h:commandLink>
<it:tree id="customizedTree" var="node"
value="#{treeBean.rootNodes}"
-<<<<<<< HEAD
selectionType="#{treeBean.selectionType}"
toggleType="#{treeBean.toggleType}"
styleClass="#{treeBean.showCustomClasses ? 'customClass' :
''}">
<it:treeNode iconLeaf="/images/leaf.png"
iconExpanded="/images/minus.png" iconCollapsed="/images/plus.png"
styleClass="customNodeClass" handleClass="customHandleClass"
iconClass="customIconClass" labelClass="customLabelClass">
-=======
- selectionType="#{treeBean.selectionType}"
toggleType="#{treeBean.toggleType}">
-
- <it:treeNode iconLeaf="/images/leaf.png"
iconExpanded="/images/minus.png" iconCollapsed="/images/plus.png">
->>>>>>>
https://jira.jboss.org/browse/RF-9715
#{node.data}
</it:treeNode>
</it:tree>
-<<<<<<< HEAD
<it:tree id="defaultNodeTree" var="node"
value="#{treeBean.rootNodes}"
selectionType="#{treeBean.selectionType}"
toggleType="#{treeBean.toggleType}">
</it:tree>
-=======
->>>>>>>
https://jira.jboss.org/browse/RF-9715
</h:form>
</h:body>
</html>
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:24:23 UTC (rev 20096)
+++
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js 2010-11-18
16:26:56 UTC (rev 20097)
@@ -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() {