test moving jquery and bootstrap to minify js

STEPBible · Nov 8, 2023 · b3712a3 · b3712a3
1 parent b0ce9c8
commit b3712a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/step-web/pom.xml b/step-web/pom.xml
@@ -182,6 +182,8 @@
 								<jsSourceDir>.</jsSourceDir>
 								<jsSourceFiles>
 									<!--<jsSourceFile>libs/dohighlight-min.js</jsSourceFile>-->
+									<jsSourceFile>libs/jquery-1.10.2.min.js</jsSourceFile>
+									<jsSourceFile>libs/bootstrap.min.js</jsSourceFile>
 									<jsSourceFile>libs/sprintf-0.7-beta1.js</jsSourceFile>
 									<jsSourceFile>libs/underscore-min.js</jsSourceFile>
 									<jsSourceFile>libs/json2.js</jsSourceFile>

diff --git a/step-web/src/main/webapp/start.jsp b/step-web/src/main/webapp/start.jsp
@@ -489,8 +489,8 @@ userCountry = (userCountry == null) ? "UNKNOWN" : userCountry.toUpperCase();
     }
 
 </script>
-<script src="libs/jquery-1.10.2.min.js" type="text/javascript"></script>
-<script src="libs/bootstrap.min.js" type="text/javascript"></script>
+<%-- <script src="libs/jquery-1.10.2.min.js" type="text/javascript"></script> --%>
+<%-- <script src="libs/bootstrap.min.js" type="text/javascript"></script> --%>
 <script src="libs/introjs.min.js" type="text/javascript"></script>
 <%
     if (request.getParameter("debug") != null) {
@@ -504,12 +504,16 @@ userCountry = (userCountry == null) ? "UNKNOWN" : userCountry.toUpperCase();
 
 <c:choose>
     <c:when test="${ param.debug eq '' }">
+        <script src="libs/jquery-1.10.2.min.js" type="text/javascript"></script>
+        <script src="libs/bootstrap.min.js" type="text/javascript"></script>
         <script src="libs/backbone.js" type="text/javascript"></script>
         <script src="libs/backbone.localStorage.js" type="text/javascript"></script>
         <script src="libs/select2.js" type="text/javascript"></script>
         <script src="libs/require-2.1.9.js" type="text/javascript"></script>
     </c:when>
     <c:otherwise>
+        <script src="libs/jquery-1.10.2.min.js" type="text/javascript"></script>
+        <script src="libs/bootstrap.min.js" type="text/javascript"></script>
         <script src="libs/backbone-min.js" type="text/javascript"></script>
         <script src="libs/backbone.localStorage-min.js" type="text/javascript"></script>
         <script src="libs/select2-3.4.5.min.js" type="text/javascript"></script>