Repository: wicket Updated Branches: refs/heads/wicket-6.x 3a5648b17 -> cf8fce943
WICKET-5682: always trigger onload after domready Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cf8fce94 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cf8fce94 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cf8fce94 Branch: refs/heads/wicket-6.x Commit: cf8fce943b5cc22ab54c4e028a062f6a17dafa3c Parents: 3a5648b Author: Emond Papegaaij <[email protected]> Authored: Mon Aug 25 17:06:56 2014 +0200 Committer: Emond Papegaaij <[email protected]> Committed: Mon Aug 25 17:06:56 2014 +0200 ---------------------------------------------------------------------- .../wicket/ajax/res/js/wicket-event-jquery.js | 4 +++ .../.settings/org.eclipse.wst.common.component | 30 ++++++++++---------- 2 files changed, 19 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/cf8fce94/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js index d8b6825..f0b48b4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js +++ b/wicket-core/src/main/java/org/apache/wicket/ajax/res/js/wicket-event-jquery.js @@ -226,6 +226,10 @@ add: function (element, type, fn, data, selector) { if (type === 'domready') { jQuery(fn); + } else if (type === 'load' && element === window) { + jQuery(window).on('load', function() { + jQuery(fn); + }); } else { // try to find the element once the DOM is ready jQuery(function() { http://git-wip-us.apache.org/repos/asf/wicket/blob/cf8fce94/wicket-examples/.settings/org.eclipse.wst.common.component ---------------------------------------------------------------------- diff --git a/wicket-examples/.settings/org.eclipse.wst.common.component b/wicket-examples/.settings/org.eclipse.wst.common.component index 7a68e6f..1d73926 100644 --- a/wicket-examples/.settings/org.eclipse.wst.common.component +++ b/wicket-examples/.settings/org.eclipse.wst.common.component @@ -2,49 +2,49 @@ <wb-module deploy-name="wicket-core"> <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/> - <dependent-module archiveName="wicket-core-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-core/wicket-core"> + <dependent-module archiveName="wicket-core-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-core/wicket-core"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-util-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-util/wicket-util"> + <dependent-module archiveName="wicket-util-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-util/wicket-util"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-request-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-request/wicket-request"> + <dependent-module archiveName="wicket-request-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-request/wicket-request"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-extensions-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-extensions/wicket-extensions"> + <dependent-module archiveName="wicket-extensions-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-extensions/wicket-extensions"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-atmosphere-0.12-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-atmosphere/wicket-atmosphere"> + <dependent-module archiveName="wicket-atmosphere-0.20-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-atmosphere/wicket-atmosphere"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-guice-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-guice/wicket-guice"> + <dependent-module archiveName="wicket-guice-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-guice/wicket-guice"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-ioc-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-ioc/wicket-ioc"> + <dependent-module archiveName="wicket-ioc-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-ioc/wicket-ioc"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-bean-validation-0.11-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-bean-validation/wicket-bean-validation"> + <dependent-module archiveName="wicket-bean-validation-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-bean-validation/wicket-bean-validation"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-jmx-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-jmx/wicket-jmx"> + <dependent-module archiveName="wicket-jmx-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-jmx/wicket-jmx"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-auth-roles-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-auth-roles/wicket-auth-roles"> + <dependent-module archiveName="wicket-auth-roles-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-auth-roles/wicket-auth-roles"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-datetime-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-datetime/wicket-datetime"> + <dependent-module archiveName="wicket-datetime-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-datetime/wicket-datetime"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-velocity-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-velocity/wicket-velocity"> + <dependent-module archiveName="wicket-velocity-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-velocity/wicket-velocity"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-spring-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-spring/wicket-spring"> + <dependent-module archiveName="wicket-spring-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-spring/wicket-spring"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-devutils-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-devutils/wicket-devutils"> + <dependent-module archiveName="wicket-devutils-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-devutils/wicket-devutils"> <dependency-type>uses</dependency-type> </dependent-module> - <dependent-module archiveName="wicket-cdi-6.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-cdi/wicket-cdi"> + <dependent-module archiveName="wicket-cdi-1.1-6.17.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/wicket-cdi-1.1/wicket-cdi-1.1"> <dependency-type>uses</dependency-type> </dependent-module> <property name="context-root" value="wicket-examples"/>
