You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2010/08/31 08:34:02 UTC
svn commit: r991091 -
/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Author: ivaynberg
Date: Tue Aug 31 06:34:02 2010
New Revision: 991091
URL: http://svn.apache.org/viewvc?rev=991091&view=rev
Log:
Issue: WICKET-2262
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java?rev=991091&r1=991090&r2=991091&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehavior.java Tue Aug 31 06:34:02 2010
@@ -228,9 +228,22 @@ public abstract class AbstractDefaultAja
if (!Strings.isEmpty(indicatorId))
{
- call = new AppendingStringBuffer("Wicket.showIncrementally('").append(indicatorId)
- .append("');")
+ final AppendingStringBuffer indicatorWithPrecondition = new AppendingStringBuffer(
+ "if (");
+ if (precondition != null)
+ {
+ indicatorWithPrecondition.append("function(){").append(precondition).append("}()");
+ }
+ else
+ {
+ indicatorWithPrecondition.append("true");
+ }
+ indicatorWithPrecondition.append(") { Wicket.showIncrementally('")
+ .append(indicatorId)
+ .append("');}")
.append(call);
+
+ call = indicatorWithPrecondition;
}
if (decorator != null)