You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by da...@apache.org on 2014/06/16 22:29:18 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/wicket-6.x'
into wicket-6.x
Merge remote-tracking branch 'origin/wicket-6.x' into wicket-6.x
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3371205a
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3371205a
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3371205a
Branch: refs/heads/wicket-6.x
Commit: 3371205aba96df8e6b83309c96a3eb557ae5b525
Parents: bc3634a 4ffd8f6
Author: Martijn Dashorst <da...@apache.org>
Authored: Mon Jun 16 22:23:29 2014 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Mon Jun 16 22:23:29 2014 +0200
----------------------------------------------------------------------
.../wicket/ajax/form/OnChangeAjaxBehavior.java | 28 ++++-
.../wicket/ajax/res/js/wicket-ajax-jquery.js | 15 +++
.../wicket/ajax/res/js/wicket-event-jquery.js | 106 +++++++++++++++----
.../request/resource/DynamicImageResource.java | 3 +-
.../ajax/form/OnChangeAjaxBehaviorTest.java | 4 +-
.../OnChangeAjaxBehaviorTestPage_expected.html | 4 +-
.../ajax/markup/html/form/upload/progressbar.js | 8 +-
.../ajax/markup/html/modal/res/modal.js | 32 +++---
8 files changed, 154 insertions(+), 46 deletions(-)
----------------------------------------------------------------------