Merge pull request #26 from AntumDeluge/srcjs

Support Loading Web Servlet Resources from src/js Directory
arianne · Mar 7, 2024 · d8a26f0 · d8a26f0
2 parents 32e6b2f + 3fd7f46
commit d8a26f0
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/marauroa/server/net/web/WebServletForStaticContent.java b/src/marauroa/server/net/web/WebServletForStaticContent.java
@@ -1,5 +1,5 @@
 /***************************************************************************
- *                   (C) Copyright 2010-2023 - Marauroa                    *
+ *                   (C) Copyright 2010-2024 - Marauroa                    *
  ***************************************************************************
  ***************************************************************************
  *                                                                         *
@@ -117,6 +117,9 @@ private void sendFile(HttpServletRequest request, HttpServletResponse response,
 		if (name.startsWith("/srcjs/")) {
 			name = name.substring(6);
 		}
+		if (name.startsWith("/src/js/")) {
+			name = name.substring(7);
+		}
 		if (name.startsWith("/build/js/")) {
 			name = name.substring(9);
 		}
@@ -128,6 +131,9 @@ private void sendFile(HttpServletRequest request, HttpServletResponse response,
 			if (is == null) {
 				is = WebServletForStaticContent.class.getClassLoader().getResourceAsStream("srcjs" + name);
 			}
+			if (is == null) {
+				is = WebServletForStaticContent.class.getClassLoader().getResourceAsStream("src/js" + name);
+			}
 			if (is == null) {
 				is = DebugInterface.get().onFileRequest(request, response, name);
 			}