You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by cj...@apache.org on 2009/12/14 14:38:59 UTC
svn commit: r890317 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
Author: cjhoward
Date: Mon Dec 14 13:38:58 2009
New Revision: 890317
URL: http://svn.apache.org/viewvc?rev=890317&view=rev
Log:
MYFACES-2458 - make <f:ajax> onevent and onerror render.
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java?rev=890317&r1=890316&r2=890317&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlAjaxBehaviorRenderer.java Mon Dec 14 13:38:58 2009
@@ -152,9 +152,9 @@
StringBuilder render = mapToString(context, AJAX_KEY_RENDER, behavior.getRender());
String onError = behavior.getOnerror();
- onError = (onError != null && onError.trim().equals(EMPTY)) ? AJAX_KEY_ONERROR + COLON + onError : null;
+ onError = (onError != null && !onError.trim().equals(EMPTY)) ? AJAX_KEY_ONERROR + COLON + onError : null;
String onEvent = behavior.getOnevent();
- onEvent = (onEvent != null && onEvent.trim().equals(EMPTY)) ? AJAX_KEY_ONEVENT + COLON + onEvent : null;
+ onEvent = (onEvent != null && !onEvent.trim().equals(EMPTY)) ? AJAX_KEY_ONEVENT + COLON + onEvent : null;
String sourceId = (context.getSourceId() == null) ? AJAX_VAL_THIS : '\''+context.getSourceId()+'\'';
String event = context.getEventName();
@@ -176,6 +176,12 @@
if (render != null) {
parameterList.add(render.toString());
}
+ if (onError != null) {
+ parameterList.add (onError);
+ }
+ if (onEvent != null) {
+ parameterList.add (onEvent);
+ }
if (paramSize > 0) {
/**
* see ClientBehaviorContext.html of the spec