Moved require config base url to before requre config js git-svn-id: https://svn.apache.org/repos/asf/rave/trunk@1524166 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/rave/repo Commit: http://git-wip-us.apache.org/repos/asf/rave/commit/f59ed071 Tree: http://git-wip-us.apache.org/repos/asf/rave/tree/f59ed071 Diff: http://git-wip-us.apache.org/repos/asf/rave/diff/f59ed071 Branch: refs/heads/angular Commit: f59ed0718e7ece55216341ab67718c4950a904dd Parents: 3a4d70b Author: Matthew B. Franklin <[email protected]> Authored: Tue Sep 17 18:43:27 2013 +0000 Committer: Matthew B. Franklin <[email protected]> Committed: Tue Sep 17 18:43:27 2013 +0000 ---------------------------------------------------------------------- rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/rave/blob/f59ed071/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag ---------------------------------------------------------------------- diff --git a/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag b/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag index 7011a1c..2cde8b5 100644 --- a/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag +++ b/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag @@ -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>
