Repository: wicket Updated Branches: refs/heads/wicket-7.x 8c43b38a4 -> f71a2d33c
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/f71a2d33 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f71a2d33 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f71a2d33 Branch: refs/heads/wicket-7.x Commit: f71a2d33c2ff9dbb669066a3dfc7b58229824b0e Parents: 8c43b38 Author: Sven Meier <[email protected]> Authored: Tue Jun 28 21:03:05 2016 +0200 Committer: Sven Meier <[email protected]> Committed: Tue Jun 28 21:03:05 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/f71a2d33/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 ec1ef4e..aa591c4 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 @@ -44,11 +44,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 @@ -89,12 +84,6 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav { super.renderHead(component, response); - if (component.getRequestCycle().find(IPartialPageRequestHandler.class) == null) - { - // complete page is rendered, so timeout has to be rendered again - hasTimeout = false; - } - if (isStopped() == false) { addTimeout(response); @@ -127,9 +116,6 @@ public abstract class AbstractAjaxTimerBehavior extends AbstractDefaultAjaxBehav if (shouldTrigger()) { - // re-add timeout - hasTimeout = false; - addTimeout(target.getHeaderResponse()); return; @@ -190,23 +176,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/f71a2d33/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);
