Merge branch 'sandbox/preserve-page-parameters-and-execute-listener-interface-after-expiration' into sandbox/WICKET-4441-create-new-page-hybrid-url-with-different-parameters
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/aa84e95a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/aa84e95a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/aa84e95a Branch: refs/heads/sandbox/WICKET-4441-create-new-page-hybrid-url-with-different-parameters Commit: aa84e95aba7b5c776395832fb3ad375e405e3cc5 Parents: a53591f 79ba338 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Thu Jan 16 12:52:40 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Thu Jan 16 12:52:40 2014 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Component.java | 2 +- .../src/main/java/org/apache/wicket/Page.java | 3 + .../wicket/ajax/res/js/wicket-event-jquery.js | 26 +++++- .../ListenerInterfaceRequestHandler.java | 98 ++++++++++---------- .../markup/html/form/NumberTextField.java | 16 +++- .../wicket/request/cycle/RequestCycle.java | 6 +- .../request/resource/PackageResource.java | 6 +- .../apache/wicket/settings/PageSettings.java | 25 ++++- .../ListenerInterfaceRequestHandlerTest.java | 31 ++++++- .../markup/html/form/NumberTextFieldTest.java | 34 ++++++- .../PageExpirationRecoveryTest.java | 4 +- .../wicket/request/cycle/UrlRendererTest.java | 11 +++ wicket-core/src/test/js/event.js | 20 ++++ .../ajax/markup/html/modal/res/modal.js | 18 ++-- .../org/apache/wicket/request/UrlRenderer.java | 4 +- .../util/resource/ResourceStreamWrapper.java | 2 +- 16 files changed, 225 insertions(+), 81 deletions(-) ----------------------------------------------------------------------
