continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From batkin...@apache.org
Subject svn commit: r1659454 - in /continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp: decorators/default.jsp viewProjectBuildsReport.jsp
Date Fri, 13 Feb 2015 04:58:57 GMT
Author: batkinson
Date: Fri Feb 13 04:58:57 2015
New Revision: 1659454

URL: http://svn.apache.org/r1659454
Log:
Enabled jquery globally and fixed jquery/prototype conflict in Chrome.

Modified:
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp?rev=1659454&r1=1659453&r2=1659454&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/decorators/default.jsp Fri
Feb 13 04:58:57 2015
@@ -21,6 +21,7 @@
 
 <%@ taglib uri="http://www.opensymphony.com/sitemesh/decorator" prefix="decorator" %>
 <%@ taglib uri="/struts-tags" prefix="s" %>
+<%@ taglib uri='http://java.sun.com/jsp/jstl/core' prefix='c'%>
 
 <html>
 <head>
@@ -32,6 +33,10 @@
   <link rel="stylesheet" type="text/css" href="<s:url value="/css/print.css" includeParams="none"/>"
media="print"/>
   <link rel="stylesheet" type="text/css" href="<s:url value="/css/extremecomponents.css"
includeParams="none"/>" media="screen"/>
   <link rel="shortcut icon" href="<s:url value="/favicon.ico" includeParams="none"/>"
type="image/x-icon"/>
+  <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
+  <script language="javascript" type="text/javascript">
+    $.noConflict();
+  </script>
   <script type="text/javascript" src="<s:url value="/js/prototype.js" includeParams="none"/>"></script>
   <s:head/>
   <decorator:head/>

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp?rev=1659454&r1=1659453&r2=1659454&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/viewProjectBuildsReport.jsp
Fri Feb 13 04:58:57 2015
@@ -27,10 +27,9 @@
     <title><s:text name="projectBuilds.report.title"/></title>
     <s:head/>
     <link rel="stylesheet" href="<c:url value='/css/no-theme/jquery-ui-1.7.2.custom.css'/>"
type="text/css" />
-    <script type="text/javascript" src="<c:url value='/js/jquery-1.3.2.min.js'/>"></script>
     <script type="text/javascript" src="<c:url value='/js/jquery-ui-1.7.2.custom.min.js'/>"></script>
     <script type="text/javascript">
-      $(document).ready(function()
+      jQuery(document).ready(function($)
       {
         $('#startDate').datepicker()
         $('#endDate').datepicker()



Mime
View raw message