Author: abelevich
Date: 2008-04-21 08:14:09 -0400 (Mon, 21 Apr 2008)
New Revision: 7992
Modified:
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx
Log:
fix custom icon URI defenition, in the render remove static call of the getAsEventHandler
function
Modified:
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java
===================================================================
---
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-04-21
12:12:35 UTC (rev 7991)
+++
trunk/ui/inplaceInput/src/main/java/org/richfaces/renderkit/InplaceInputBaseRenderer.java 2008-04-21
12:14:09 UTC (rev 7992)
@@ -219,7 +219,7 @@
}
public String getAsEventHandler(FacesContext context, UIComponent component, String
attributeName) {
- JSFunctionDefinition script = RendererUtils.getAsEventHandler(context, component,
attributeName, null);
+ JSFunctionDefinition script = getUtils().getAsEventHandler(context, component,
attributeName, null);
return ScriptUtils.toScript(script);
}
Modified: trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx
===================================================================
--- trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-04-21 12:12:35 UTC
(rev 7991)
+++ trunk/ui/inplaceInput/src/main/templates/inplaceinput.jspx 2008-04-21 12:14:09 UTC
(rev 7992)
@@ -46,12 +46,12 @@
String saveIcon =
(String)component.getAttributes().get("saveControlIcon");
if (saveIcon != null && saveIcon.length() != 0 ) {
- variables.setVariable("saveIcon", saveIcon);
+ variables.setVariable("saveIcon", getResource(saveIcon).getUri(context,
component));
}
String cancelIcon =
(String)component.getAttributes().get("cancelControlIcon");
if (cancelIcon != null && cancelIcon.length() != 0 ) {
- variables.setVariable("cancelIcon", cancelIcon);
+ variables.setVariable("cancelIcon",
getResource(cancelIcon).getUri(context, component));
}
String controlClass =
(String)component.getAttributes().get("controlClass");