litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1389 NIHVIVO-1506 Added include for ${scripts} variable that had been mistakenly left out of basicPage.jsp. This was resulting in missing JavaScript and causing problems on individual control panel and visualizations for the individual page. Once the JS was returned, there was still another problem with jQuery's user of $() conflicting with DWR on the entity edits page. Resolved this using jQuery's built in noConflict() method.

Browse source
This commit is contained in:
nac26 2010-12-15 13:46:09 +00:00
parent d2c83703cd
commit b27b3aa607
2 changed files with 22 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
webapp/web/templates/edit/specific/ents_edit_head.jsp
View file

@ -1,5 +1,5 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<%
request.setAttribute("dwrDisabled", new Boolean(false));
@ -11,23 +11,26 @@ String context = request.getContextPath();
<%
if (!(Boolean)request.getAttribute("dwrDisabled")) {
%>
<script type="text/javascript">
// relinquish jQuery's control of the $ variable to avoid conflicts with DWR
jQuery.noConflict();
</script>
<script type="text/javascript" xml:space="preserve">
var gEntityURI="${entity.URI}";
</script> <!-- There has got to be a better way to pass this to the js -->
<script type='text/javascript' src='<%=context%>/dwr/interface/PropertyDWR.js'></script>
<script type='text/javascript' src='<%=context%>/dwr/interface/EntityDWR.js'></script>
<script type='text/javascript' src='<%=context%>/dwr/interface/VClassDWR.js'></script>
<script type='text/javascript' src='<%=context%>/dwr/engine.js'></script>
<script type='text/javascript' src='<%=context%>/dwr/util.js'></script>
<script type='text/javascript' src='<%=context%>/js/betterDateInput.js'></script>
<script type='text/javascript' src='<%=context%>/js/vitro.js'></script>
<script type='text/javascript' src='<%=context%>/dojo.js'></script>
<script type='text/javascript' src='<%=context%>/js/ents_edit.js'></script>
<script type='text/javascript' src='<%=context%>/js/detect.js'></script>
<script language="JavaScript" type="text/javascript" src="js/toggle.js"></script>
<script type="text/javascript" src="<%=context%>/dwr/interface/PropertyDWR.js"></script>
<script type="text/javascript" src="<%=context%>/dwr/interface/EntityDWR.js"></script>
<script type="text/javascript" src="<%=context%>/dwr/interface/VClassDWR.js"></script>
<script type="text/javascript" src="<%=context%>/dwr/engine.js"></script>
<script type="text/javascript" src="<%=context%>/dwr/util.js"></script>
<script type="text/javascript" src="<%=context%>/js/betterDateInput.js"></script>
<script type="text/javascript" src="<%=context%>/js/vitro.js"></script>
<script type="text/javascript" src="<%=context%>/dojo.js"></script>
<script type="text/javascript" src="<%=context%>/js/ents_edit.js"></script>
<script type="text/javascript" src="<%=context%>/js/detect.js"></script>
<script type="text/javascript" src="<%=context%>/js/toggle.js"></script>
<%
} %>

6
webapp/web/templates/page/basicPage.jsp
View file

@ -59,7 +59,11 @@
<!DOCTYPE html>
<html lang="en">
${ftl_head}
<head>
${ftl_head}
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
</head>
<body ${requestScope.bodyAttr}>
${ftl_identity}