Merge remote-tracking branch 'upstream/master' into trunk
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/da4c9895 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/da4c9895 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/da4c9895 Branch: refs/heads/master Commit: da4c98957211f346e07c758fc7e5508c4307382e Parents: 56084e9 a92efff Author: Michael Mosmann <[email protected]> Authored: Thu Jan 10 22:04:59 2013 +0100 Committer: Michael Mosmann <[email protected]> Committed: Thu Jan 10 22:04:59 2013 +0100 ---------------------------------------------------------------------- .../AjaxFormChoiceComponentUpdatingBehavior.java | 109 +++-------- .../AjaxFormChoiceComponentUpdatingBehavior.js | 20 +-- .../form/AjaxFormComponentUpdatingBehavior.java | 31 +++- .../org/apache/wicket/model/ComponentModel.java | 6 +- wicket-experimental/wicket-atmosphere/pom.xml | 2 +- .../org/apache/wicket/atmosphere/EventBus.java | 84 +++++++- .../atmosphere/ResourceRegistrationListener.java | 51 +++++ .../apache/wicket/atmosphere/jquery.atmosphere.js | 159 +++++++++------ 8 files changed, 286 insertions(+), 176 deletions(-) ----------------------------------------------------------------------
