You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/04/05 15:42:05 UTC
svn commit: r1309856 - in
/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF:
jsp/templates/base_layout.jsp tags/rave_js.tag tags/third_party_js.tag
Author: carlucci
Date: Thu Apr 5 13:42:04 2012
New Revision: 1309856
URL: http://svn.apache.org/viewvc?rev=1309856&view=rev
Log:
RAVE-545: Upgrade to jQuery 1.7.2 and jQueryUI 1.8.17
Added:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag
- copied, changed from r1309125, rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp?rev=1309856&r1=1309855&r2=1309856&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/templates/base_layout.jsp Thu Apr 5 13:42:04 2012
@@ -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>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1309856&r1=1309855&r2=1309856&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag Thu Apr 5 13:42:04 2012
@@ -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'}" />
Copied: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag (from r1309125, rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag?p2=rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag&p1=rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag&r1=1309125&r2=1309856&rev=1309856&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/third_party_js.tag Thu Apr 5 13:42:04 2012
@@ -17,42 +17,18 @@
under the License.
--%>
-<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
-
-<portal:render-script location="${'BEFORE_LIB'}" />
+<%--
+ 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.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/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]-->
-<portal:render-script location="${'AFTER_LIB'}" />
-<%-- local rave scripts --%>
-<portal:render-script location="${'BEFORE_RAVE'}" />
-<%-- check to see if the javaScriptDebugMode is on, if so render the individual JS files, otherwise render the minified single file --%>
-<c:choose>
- <c:when test="${not empty portalSettings and not empty portalSettings['javaScriptDebugMode'] and portalSettings['javaScriptDebugMode'].value == '0'}">
- <script src="<spring:url value="/script/rave_all.min.js"/>"></script>
- </c:when>
- <c:otherwise>
- <script src="<spring:url value="/script/rave.js"/>"></script>
- <script src="<spring:url value="/script/rave_api.js"/>"></script>
- <script src="<spring:url value="/script/rave_opensocial.js"/>"></script>
- <script src="<spring:url value="/script/rave_wookie.js"/>"></script>
- <script src="<spring:url value="/script/rave_layout.js"/>"></script>
- <script src="<spring:url value="/script/rave_forms.js"/>"></script>
- <script src="<spring:url value="/script/rave_person_profile.js"/>"></script>
- <script src="<spring:url value="/script/rave_store.js"/>"></script>
- <script src="<spring:url value="/script/rave_admin.js"/>"></script>
- </c:otherwise>
-</c:choose>
-<script src="<spring:url value="/app/messagebundle/rave_client_messages.js"/>"></script>
-<portal:render-script location="${'AFTER_RAVE'}" />
-<%-- common javascript to execute on all pages --%>
-<script>
- rave.setContext("<spring:url value="/app/" />");
-</script>