Author: maksimkaszynski Date: 2008-03-21 13:58:37 -0400 (Fri, 21 Mar 2008) New Revision: 7080 Modified: trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java Log: Modified: trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java =================================================================== --- trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-21 17:50:52 UTC (rev 7079) +++ trunk/ui/componentControl/src/main/java/org/richfaces/component/UIComponentControl.java 2008-03-21 17:58:37 UTC (rev 7080) @@ -6,15 +6,15 @@ import java.util.Iterator; +import javax.el.ValueExpression; import javax.faces.component.UIComponent; import javax.faces.component.UIComponentBase; import javax.faces.component.UIParameter; import javax.faces.context.FacesContext; -import javax.faces.el.ValueBinding; import org.ajax4jsf.Messages; import org.ajax4jsf.component.AjaxSupport; -import org.ajax4jsf.component.EventValueBinding; +import org.ajax4jsf.component.EventValueExpression; import org.ajax4jsf.component.JavaScriptParameter; import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.JSReference; @@ -95,7 +95,7 @@ ScriptUtils.addEncodedString(result, name); result.append(": "); - result.append(ScriptUtils.toScript(escape ? value : new JSReference(value.toString()))); + result.append(ScriptUtils.toScript(escape ? value : new JSFunction("Richfaces.delayedEval", value))); shouldClose = true; } @@ -103,7 +103,7 @@ return result.toString(); } - + public abstract String getEvent(); public abstract void setEvent(String event); @@ -158,12 +158,12 @@ if (event != null && event.length() != 0) { if (attachTo == null || attachTo.length() == 0) { - parent.setValueBinding(event, new EventValueBinding(this)); + parent.setValueExpression(event, new EventValueExpression(this)); } else { - ValueBinding vb = parent.getValueBinding(event); - if (vb instanceof EventValueBinding) { + ValueExpression vb = parent.getValueExpression(event); + if (vb instanceof EventValueExpression) { //TODO check if that's EventValueBinding for us - parent.setValueBinding(event, null); + parent.setValueExpression(event, null); } } }