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 2014/12/19 14:42:35 UTC
[7/7] wicket git commit: WICKET-5791 Update JQuery to 1.11.2 and 2.1.3
WICKET-5791 Update JQuery to 1.11.2 and 2.1.3
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bebe788c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bebe788c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bebe788c
Branch: refs/heads/master
Commit: bebe788cd2c2f19c6623f7b0537c26317d08715f
Parents: a1fcd92
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Dec 19 15:41:16 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Dec 19 15:41:16 2014 +0200
----------------------------------------------------------------------
.../DynamicJQueryResourceReference.java | 2 +-
.../resource/JQueryResourceReference.java | 2 +-
.../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.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 | 2 +-
wicket-core/src/test/js/amd.html | 2 +-
.../yui/calendar/DatesPage1_ExpectedResult.html | 2 +-
.../src/main/webapp/js-test/lib/jquery.js | 16342 +++++++++--------
33 files changed, 8218 insertions(+), 27686 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bebe788c/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 ccc953f..c626b17 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.1.js";
+ public static final String VERSION_2 = "jquery/jquery-2.1.3.js";
public DynamicJQueryResourceReference()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/bebe788c/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 9c2886b..ef1435c 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.1.js";
+ public static final String VERSION_1 = "jquery/jquery-1.11.2.js";
private static final JQueryResourceReference INSTANCE = new JQueryResourceReference();