Author: nbelaevski
Date: 2010-11-18 11:33:28 -0500 (Thu, 18 Nov 2010)
New Revision: 20100
Modified:
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js
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:31:41 UTC (rev 20099)
+++
trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/tree.js 2010-11-18
16:33:28 UTC (rev 20100)
@@ -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() {
@@ -163,19 +163,11 @@
switch (tree.getToggleType()) {
case 'client':
this.__rootElt.addClass(TREE_CLASSES[newState ? 1 :
0]).removeClass(TREE_CLASSES[!newState ? 1 : 0]);
-<<<<<<< HEAD
this.__getHandle().addClass(TREE_HANDLE_CLASSES[newState ? 1 :
0]).removeClass(TREE_HANDLE_CLASSES[!newState ? 1 : 0]);
var icons = this.__getIcons();
if (icons.length == 1) {
icons.addClass(TREE_ICON_CLASSES[newState ? 1 :
0]).removeClass(TREE_ICON_CLASSES[!newState ? 1 : 0]);
-=======
-
- var handles = this.__getHandles();
-
- if (handles.length == 1) {
- handles.addClass(TREE_HANDLE_CLASSES[newState ? 1 :
0]).removeClass(TREE_HANDLE_CLASSES[!newState ? 1 : 0]);
->>>>>>>
https://jira.jboss.org/browse/RF-9715
}
this.__updateClientToggleStateInput(newState);