Author: konstantin.mishin Date: 2008-08-04 08:57:57 -0400 (Mon, 04 Aug 2008) New Revision: 9884 Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java Log: RF-3653 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-04 12:14:14 UTC (rev 9883) +++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/NodeRendererBase.java 2008-08-04 12:57:57 UTC (rev 9884) @@ -65,11 +65,13 @@ boolean showLines = tree.isShowConnectingLines(); String id = treeNode.getClientId(context); - String script; - if (tree.isExpanded()) { - script = (String)tree.getAttributes().get("oncollapse"); + StringBuilder script = new StringBuilder(); + script.append("Event.findElement(event, 'TABLE').object."); + boolean expanded = tree.isExpanded(); + if (expanded) { + script.append("fireCollapsionEvent();"); } else { - script = (String)tree.getAttributes().get("onexpand"); + script.append("fireExpansionEvent();"); } if (UITree.SWITCH_AJAX.equals(tree.getSwitchType())) { @@ -81,8 +83,7 @@ Map parameters = (Map) eventOptions.get("parameters"); parameters.remove(id); - parameters.put(id + NODE_EXPANDED_INPUT_SUFFIX, String.valueOf(!tree - .isExpanded())); + parameters.put(id + NODE_EXPANDED_INPUT_SUFFIX, String.valueOf(!expanded)); parameters.put(id + AJAX_EXPANDED_SUFFIX, Boolean.TRUE); function.addParameter(eventOptions); @@ -106,7 +107,7 @@ result.append("params['"); result.append(paramName); result.append("'] = "); - result.append(!tree.isExpanded()); + result.append(!expanded); result.append(';'); result.append("Richfaces.jsFormSubmit('"); result.append(id);