Author: nbelaevski Date: 2008-08-26 14:05:23 -0400 (Tue, 26 Aug 2008) New Revision: 10200 Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js Log: https://jira.jboss.org/jira/browse/RF-4256 Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java =================================================================== --- trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2008-08-26 17:40:27 UTC (rev 10199) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2008-08-26 18:05:23 UTC (rev 10200) @@ -66,12 +66,12 @@ String id = treeNode.getClientId(context); StringBuilder script = new StringBuilder(); - script.append("$(this).up('TABLE').object."); + script.append("Tree."); boolean expanded = tree.isExpanded(); if (expanded) { - script.append("fireCollapsionEvent();"); + script.append("fireCollapsionEvent(this);"); } else { - script.append("fireExpansionEvent();"); + script.append("fireExpansionEvent(this);"); } if (UITree.SWITCH_AJAX.equals(tree.getSwitchType())) { 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 2008-08-26 17:40:27 UTC (rev 10199) +++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js 2008-08-26 18:05:23 UTC (rev 10200) @@ -19,6 +19,22 @@ Tree.CLASS_ITEM_COLLAPSED = "dr-tree-h-ic-line-clp"; Tree.CLASS_AJAX_SELECTED_LISTENER_FLAG = "ajax_selected_listener_flag"; +Tree.findComponent = function(elt) { + while (elt && (!elt.tagName || elt.tagName.toLowerCase() != 'table')) { + elt = elt.parentNode; + } + + return elt.object; +}; + +Tree.fireCollapsionEvent = function(elt) { + return Tree.findComponent(elt).fireCollapsionEvent(); +}; + +Tree.fireExpansionEvent = function(elt) { + return Tree.findComponent(elt).fireExpansionEvent(); +}; + Tree.prototype = { initialize: function(id, input, switchType, events, onAjaxSelect, toggleOnClick, showConnectingLines) { this.childs = [];