Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
RAVE-545: Upgrade to jQuery 1.7.2 and jQueryUI 1.8.17
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1309856 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Anthony Carlucci committed Apr 5, 2012
1 parent af55721 commit f71c3a3
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 12 deletions.
Expand Up @@ -54,7 +54,7 @@ under the License.
<c:out value="${portalSettings['titleSuffix'].value}"/>
</c:if>
</title>
<link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.13/themes/base/jquery-ui.css"/>
<link rel="stylesheet" href="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/themes/base/jquery-ui.css"/>
<link rel="stylesheet" href="<c:url value="/css/default.css" />"/>
<rave:custom_css/>
</head>
Expand Down
12 changes: 1 addition & 11 deletions rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Expand Up @@ -18,18 +18,8 @@
--%>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>

<portal:render-script location="${'BEFORE_LIB'}" />
<%-- json script --%>
<script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<%-- jquery scripts --%>
<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"></script>
<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
<%-- google css3 mediaqueries script --%>
<!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
<%-- google html5 script --%>
<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
<rave:third_party_js />
<portal:render-script location="${'AFTER_LIB'}" />
<%-- local rave scripts --%>
<portal:render-script location="${'BEFORE_RAVE'}" />
Expand Down
@@ -0,0 +1,34 @@
<%--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.

--%>
<%--
This file includes references to all external third party javascript libraries required by rave
Overlay this file in custom extensions of Rave if you host these libraries internally and don't need
to pull them in externally.
--%>
<%-- json script --%>
<script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
<%-- jquery scripts --%>
<script src="//ajax.aspnetcdn.com/ajax/jquery/jquery-1.7.2.min.js"></script>
<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.17/jquery-ui.min.js"></script>
<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
<%-- google css3 mediaqueries script --%>
<!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
<%-- google html5 script --%>
<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->

0 comments on commit f71c3a3

Please sign in to comment.