Author: mgrigorov
Date: Sun Jul 18 10:00:21 2010
New Revision: 965193

URL: http://svn.apache.org/viewvc?rev=965193&view=rev
Log:
Port from wicket-1.4.x

r949729
Author: jcompagner
Date:   Mon May 31 12:35:50 2010 UTC (6 weeks, 5 days ago)
Changed paths:  1
Log Message:    
timer behavior shouldnt add it self again when it is disabled.
Now testing for isEnabled() in the response that adds the onload script 
(renderHead is also not called when it is disabled)


Modified:
    
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java

Modified: 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java?rev=965193&r1=965192&r2=965193&view=diff
==============================================================================
--- 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
 (original)
+++ 
wicket/trunk/wicket/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
 Sun Jul 18 10:00:21 2010
@@ -157,7 +157,7 @@ public abstract class AbstractAjaxTimerB
        {
                onTimer(target);
 
-               if (!stopped)
+               if (!stopped && isEnabled(getComponent()))
                {
                        
target.getHeaderResponse().renderOnLoadJavascript(getJsTimeoutCall(updateInterval));
                }


Reply via email to