You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/01/11 20:21:50 UTC
[10/10] wicket git commit: WICKET-6071 Upgrade jQuery to 1.12 / 2.2.0
WICKET-6071 Upgrade jQuery to 1.12 / 2.2.0
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3bb3f2f3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3bb3f2f3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3bb3f2f3
Branch: refs/heads/wicket-6.x
Commit: 3bb3f2f35e0832e2056a4ada4a5c25eb5f21bb58
Parents: 9ad1c74
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Jan 11 20:21:11 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Jan 11 20:21:11 2016 +0100
----------------------------------------------------------------------
.../DynamicJQueryResourceReference.java | 2 +-
.../resource/JQueryResourceReference.java | 2 +-
.../wicket/resource/jquery/jquery-1.11.3.js | 10351 ----------------
.../wicket/resource/jquery/jquery-1.11.3.min.js | 5 -
.../wicket/resource/jquery/jquery-1.12.0.js | 11027 +++++++++++++++++
.../wicket/resource/jquery/jquery-1.12.0.min.js | 5 +
.../wicket/resource/jquery/jquery-2.1.4.js | 9210 --------------
.../wicket/resource/jquery/jquery-2.1.4.min.js | 4 -
.../wicket/resource/jquery/jquery-2.2.0.js | 9831 +++++++++++++++
.../wicket/resource/jquery/jquery-2.2.0.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 | 2 +-
.../yui/calendar/DatesPage1_ExpectedResult.html | 2 +-
35 files changed, 20894 insertions(+), 19597 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb3f2f3/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 90b8eb9..d26bfd1 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.4.js";
+ public static final String VERSION_2 = "jquery/jquery-2.2.0.js";
public DynamicJQueryResourceReference()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/3bb3f2f3/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 deb2885..d31267e 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.3.js";
+ public static final String VERSION_1 = "jquery/jquery-1.12.0.js";
private static final JQueryResourceReference INSTANCE = new JQueryResourceReference();