Skip to content

Commit

Permalink
Support loading web servlet resources from src/js directory
Browse files Browse the repository at this point in the history
  • Loading branch information
AntumDeluge committed Mar 1, 2024
1 parent 32e6b2f commit 3fd7f46
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/marauroa/server/net/web/WebServletForStaticContent.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/***************************************************************************
* (C) Copyright 2010-2023 - Marauroa *
* (C) Copyright 2010-2024 - Marauroa *
***************************************************************************
***************************************************************************
* *
Expand Down Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand Down

0 comments on commit 3fd7f46

Please sign in to comment.