Author: mfranklin
Date: Tue Sep 17 18:43:27 2013
New Revision: 1524166
URL: http://svn.apache.org/r1524166
Log:
Moved require config base url to before requre config js
Modified:
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/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=1524166&r1=1524165&r2=1524166&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
Tue Sep 17 18:43:27 2013
@@ -26,16 +26,16 @@
<c:choose>
<%-- check to see if the javaScriptDebugMode is on, if so render the
individual JS files, otherwise render the minified single file --%>
<c:when test="${jsDebugMode == '1'}">
- <script src="<spring:url
value="/static/script/requireConfig.js"/>"></script>
<script>
requirejs.config({baseUrl:"<c:url value="/static/script"/>"});
</script>
+ <script src="<spring:url
value="/static/script/requireConfig.js"/>"></script>
</c:when>
<c:otherwise>
- <script src="<spring:url
value="/static/script-built/requireConfig.js"/>"></script>
<script>
requirejs.config({baseUrl:"<c:url
value="/static/script-built"/>"});
</script>
+ <script src="<spring:url
value="/static/script-built/requireConfig.js"/>"></script>
</c:otherwise>
</c:choose>
