You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/01/07 15:03:25 UTC
git commit: WICKET-4939 AbstractAjaxTimerBehavior never triggers if
attached to WebPage
Updated Branches:
refs/heads/master 00897c8ac -> 0fa9d824c
WICKET-4939 AbstractAjaxTimerBehavior never triggers if attached to WebPage
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0fa9d824
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0fa9d824
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0fa9d824
Branch: refs/heads/master
Commit: 0fa9d824ce57b818c506de68867d68621b4e74ed
Parents: 00897c8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jan 7 16:02:45 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jan 7 16:02:45 2013 +0200
----------------------------------------------------------------------
.../wicket/ajax/AbstractAjaxTimerBehavior.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0fa9d824/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
index 6fb5876..83edeaa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
@@ -17,11 +17,11 @@
package org.apache.wicket.ajax;
import org.apache.wicket.Component;
+import org.apache.wicket.Page;
import org.apache.wicket.core.util.string.JavaScriptUtils;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.util.time.Duration;
@@ -140,11 +140,18 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
}
}
- private boolean shouldTrigger()
+ /**
+ * Decides whether the timer behavior should render its JavaScript to re-trigger
+ * it after the update interval.
+ *
+ * @return {@code true} if the behavior is not stopped, it is enabled and still attached to
+ * any component in the page or to the page itself
+ */
+ protected boolean shouldTrigger()
{
return isStopped() == false &&
isEnabled(getComponent()) &&
- getComponent().findParent(WebPage.class) != null;
+ (getComponent() instanceof Page || getComponent().findParent(Page.class) != null);
}
/**