Author: pyaschenko Date: 2007-08-09 11:02:07 -0400 (Thu, 09 Aug 2007) New Revision: 2177 Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js Log: client mode bug fixes Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-08-09 14:33:47 UTC (rev 2176) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java 2007-08-09 15:02:07 UTC (rev 2177) @@ -211,7 +211,7 @@ renderChild(context, nodeFacet); c = new Context(); - c.setClientId(tree.getClientId(context) + ":"); + c.setClientId(nodeFacet.getClientId(context) + NamingContainer.SEPARATOR_CHAR); c.setLast(this.isLastElement); c.setExpanded(tree.isExpanded()); c.setRowKey(tree.getRowKey()); @@ -337,7 +337,7 @@ tree.setRowKey(context, key); String id = tree.getNodeFacet().getClientId(context); - String treeChildrenId = tree.getClientId(context) + ":childs"; + String treeChildrenId = id + NamingContainer.SEPARATOR_CHAR + "childs"; if (ids.isEmpty() || ids.contains(id) || ids.contains(tree.getClientId(context))/* handle tree updates requests */) { writeContent(context, tree, key); encodeScripts = true; Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js =================================================================== --- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-09 14:33:47 UTC (rev 2176) +++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2007-08-09 15:02:07 UTC (rev 2177) @@ -28,8 +28,8 @@ this.switchType = switchType; this.dragIndicatorId = dragIndicatorId; this.onselect = new Function('event', (events.onselect ? events.onselect : "") + "; return true;"); - this.onexpand = new Function('event', events.onexpand); - this.oncollapse = new Function('event', events.oncollapse); + this.onexpand = new Function('event', (events.onexpand ? events.onexpand : "") + "; return true;"); + this.oncollapse = new Function('event', (events.oncollapse ? events.oncollapse : "") + "; return true;"); this.onAjaxSelect = onAjaxSelect; this.element = $(id); this.inputId = input;