WICKET-5587 Upgrade JQuery to latest releases - 1.11.1 & 2.1.1 (cherry picked from commit 54431eb0ce4dfae65131306dd08b0f2aebf76320)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9a8f42eb Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9a8f42eb Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9a8f42eb Branch: refs/heads/master Commit: 9a8f42ebbf3e07fb1496d59107cd7f4b960afe9d Parents: 450dbc0 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri May 9 09:46:30 2014 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri May 23 09:41:29 2014 +0300 ---------------------------------------------------------------------- .../DynamicJQueryResourceReference.java | 2 +- .../resource/JQueryResourceReference.java | 2 +- .../wicket/resource/jquery/jquery-1.11.0.js | 10337 ----------------- .../wicket/resource/jquery/jquery-1.11.0.min.js | 4 - .../wicket/resource/jquery/jquery-1.11.1.js | 10308 ++++++++++++++++ .../wicket/resource/jquery/jquery-1.11.1.min.js | 4 + .../wicket/resource/jquery/jquery-2.1.0.js | 9111 --------------- .../wicket/resource/jquery/jquery-2.1.0.min.js | 4 - .../wicket/resource/jquery/jquery-2.1.1.js | 9190 +++++++++++++++ .../wicket/resource/jquery/jquery-2.1.1.min.js | 4 + .../apache/wicket/TestDetachPageAjaxResult.html | 2 +- .../wicket/TestDetachPageExpectedResult.html | 2 +- .../ajax/AjaxBehaviorEnabled_expected.html | 2 +- ...axHeaderContributionPage2_ajax_expected.html | 2 +- .../AjaxHeaderContributionPage2_expected.html | 2 +- ...jaxHeaderContributionPage_ajax_expected.html | 2 +- .../AjaxHeaderContributionPage_expected.html | 2 +- .../ajax/DomReadyOrderPage_ajax_expected.html | 2 +- .../wicket/ajax/DomReadyOrderPage_expected.html | 2 +- .../form/AjaxFormSubmitTestPage_expected.html | 2 +- .../OnChangeAjaxBehaviorTestPage_expected.html | 2 +- .../ajaxLink/AjaxLinkPageExpectedResult.html | 2 +- .../AjaxLinkWithBorderPageExpectedResult.html | 2 +- .../html/ajaxLink/AjaxPage2_ExpectedResult.html | 2 +- .../SimpleTestPageExpectedResult-1.html | 2 +- .../SimpleTestPageExpectedResult.html | 2 +- .../head/filter/FilteredHeaderPageExpected.html | 2 +- .../html/basic/SimplePageExpectedResult_13.html | 2 +- .../HideableBorderPage_ExpectedResult.html | 2 +- .../panel/InlinePanelPageExpectedResult_7.html | 2 +- .../panel/InlinePanelPageExpectedResult_8.html | 2 +- .../ResourceAggregatorTest1Page_results.html | 2 +- .../ResourceAggregatorTest2Page_results.html | 2 +- wicket-core/src/test/js/all.html | 6 +- wicket-core/src/test/js/amd.html | 2 +- .../yui/calendar/DatesPage1_ExpectedResult.html | 2 +- .../src/main/webapp/js-test/lib/jquery.js | 663 +- .../js-test/tests/bean-validation/phone.js | 8 +- 38 files changed, 19858 insertions(+), 19835 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9a8f42eb/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java index cd26399..ccc953f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/DynamicJQueryResourceReference.java @@ -50,7 +50,7 @@ public class DynamicJQueryResourceReference extends JQueryResourceReference /** * jQuery ver. 2.x - works only on modern browsers */ - public static final String VERSION_2 = "jquery/jquery-2.1.0.js"; + public static final String VERSION_2 = "jquery/jquery-2.1.1.js"; public DynamicJQueryResourceReference() { http://git-wip-us.apache.org/repos/asf/wicket/blob/9a8f42eb/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java index c55ba33..9c2886b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/JQueryResourceReference.java @@ -34,7 +34,7 @@ public class JQueryResourceReference extends JavaScriptResourceReference /** * jQuery ver. 1.x - works on modern browsers and IE 6/7/8 */ - public static final String VERSION_1 = "jquery/jquery-1.11.0.js"; + public static final String VERSION_1 = "jquery/jquery-1.11.1.js"; private static final JQueryResourceReference INSTANCE = new JQueryResourceReference();
