You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2016/06/28 19:19:07 UTC
wicket git commit: WICKET-6191 always add timeout when rendered,
since wicket-ajax removes any previous timer
Repository: wicket
Updated Branches:
refs/heads/master a1937c4b6 -> 739bab408
WICKET-6191 always add timeout when rendered, since wicket-ajax removes any previous timer
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/739bab40
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/739bab40
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/739bab40
Branch: refs/heads/master
Commit: 739bab408f7c29361fd335e41479f074ea1edfca
Parents: a1937c4
Author: Sven Meier <sv...@apache.org>
Authored: Tue Jun 28 21:03:05 2016 +0200
Committer: Sven Meier <sv...@apache.org>
Committed: Tue Jun 28 21:14:22 2016 +0200
----------------------------------------------------------------------
.../wicket/ajax/AbstractAjaxTimerBehavior.java | 29 ++------------------
.../wicket/ajax/AjaxTimerBehaviorTest.java | 3 +-
2 files changed, 3 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/739bab40/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 bcb0cd6..9fd936b 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
@@ -46,11 +46,6 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
private boolean stopped = false;
/**
- * Is the timeout present in JavaScript already.
- */
- private boolean hasTimeout = false;
-
- /**
* Construct.
*
* @param updateInterval
@@ -91,12 +86,6 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
{
super.renderHead(component, response);
- if (component.getRequestCycle().find(IPartialPageRequestHandler.class).isPresent() == false)
- {
- // complete page is rendered, so timeout has to be rendered again
- hasTimeout = false;
- }
-
if (isStopped() == false)
{
addTimeout(response);
@@ -129,9 +118,6 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
if (shouldTrigger())
{
- // re-add timeout
- hasTimeout = false;
-
addTimeout(target.getHeaderResponse());
return;
@@ -192,23 +178,12 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav
private void addTimeout(IHeaderResponse headerResponse)
{
- if (hasTimeout == false)
- {
- hasTimeout = true;
-
- headerResponse.render(
- OnLoadHeaderItem.forScript(getJsTimeoutCall(updateInterval)));
- }
+ headerResponse.render(OnLoadHeaderItem.forScript(getJsTimeoutCall(updateInterval)));
}
private void clearTimeout(IHeaderResponse headerResponse)
{
- if (hasTimeout)
- {
- hasTimeout = false;
-
- headerResponse.render(OnLoadHeaderItem.forScript("Wicket.Timer.clear('" + getComponent().getMarkupId() + "');"));
- }
+ headerResponse.render(OnLoadHeaderItem.forScript("Wicket.Timer.clear('" + getComponent().getMarkupId() + "');"));
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/739bab40/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
index cf74efd..be26eb6 100644
--- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java
@@ -150,8 +150,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase
tester.clickLink(MockPageWithLinkAndComponent.LINK_ID);
- // ajax update does not set timeout
- assertMatches("Wicket.Timer.set", 0);
+ assertMatches("Wicket.Timer.set", 1);
tester.executeBehavior(timer);