From c4b9b0b1193d66dadb84f46946de26510856dfd5 Mon Sep 17 00:00:00 2001
From: Mic <misvy@vmware.com>
Date: Wed, 6 Nov 2013 08:58:15 +0800
Subject: [PATCH] migrated to the latest version of jquery and jquery-ui
---
pom.xml | 4 ++--
src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp | 13 +++++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 902bc24e..36f8a732 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,8 +60,8 @@
<!-- Web dependencies -->
<webjars-bootstrap.version>2.3.0</webjars-bootstrap.version>
- <webjars-jquery-ui.version>1.9.2</webjars-jquery-ui.version>
- <webjars-jquery.version>1.9.0</webjars-jquery.version>
+ <webjars-jquery-ui.version>1.10.3</webjars-jquery-ui.version>
+ <webjars-jquery.version>2.0.3-1</webjars-jquery.version>
<dandelion.datatables.version>0.9.2</dandelion.datatables.version>
<mysql.version>5.1.22</mysql.version>
diff --git a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
index aa5be111..f1eea21e 100644
--- a/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fragments/headTag.jsp
@@ -15,13 +15,18 @@ PetClinic :: a Spring Framework demonstration
<spring:url value="/resources/css/petclinic.css" var="petclinicCss"/>
<link href="${petclinicCss}" rel="stylesheet"/>
- <spring:url value="/webjars/jquery/1.9.0/jquery.js" var="jQuery"/>
+ <spring:url value="/webjars/jquery/2.0.3/jquery.js" var="jQuery"/>
<script src="${jQuery}"></script>
- <spring:url value="/webjars/jquery-ui/1.9.2/js/jquery-ui-1.9.2.custom.js" var="jQueryUi"/>
- <script src="${jQueryUi}"></script>
+ <!-- jquery-ui.js file is really big so we only load what we need instead of loading everything -->
+ <spring:url value="/webjars/jquery-ui/1.10.3/ui/jquery.ui.core.js" var="jQueryUiCore"/>
+ <script src="${jQueryUiCore}"></script>
- <spring:url value="/webjars/jquery-ui/1.9.2/css/smoothness/jquery-ui-1.9.2.custom.css" var="jQueryUiCss"/>
+ <spring:url value="/webjars/jquery-ui/1.10.3/ui/jquery.ui.datepicker.js" var="jQueryUiDatePicker"/>
+ <script src="${jQueryUiDatePicker}"></script>
+
+ <!-- jquery-ui.css file is not that big so we can afford to load it -->
+ <spring:url value="/webjars/jquery-ui/1.10.3/themes/base/jquery-ui.css" var="jQueryUiCss"/>
<link href="${jQueryUiCss}" rel="stylesheet"></link>
</head>
--
GitLab