Skip to content
Snippets Groups Projects
Commit e331c323 authored by srosse's avatar srosse
Browse files

OO-224: load javascripts/css from source code in debug mode (olat.debug=true + source path set)

parent ab4d3d3c
No related branches found
No related tags found
No related merge requests found
...@@ -41,8 +41,7 @@ import javax.servlet.http.HttpServletResponse; ...@@ -41,8 +41,7 @@ import javax.servlet.http.HttpServletResponse;
import org.olat.core.helpers.Settings; import org.olat.core.helpers.Settings;
import org.olat.core.logging.LogDelegator; import org.olat.core.logging.LogDelegator;
import org.olat.core.logging.OLog; import org.olat.core.util.StringHelper;
import org.olat.core.logging.Tracing;
import org.olat.core.util.WebappHelper; import org.olat.core.util.WebappHelper;
/** /**
...@@ -74,7 +73,16 @@ public class ClasspathMediaResource extends LogDelegator implements MediaResourc ...@@ -74,7 +73,16 @@ public class ClasspathMediaResource extends LogDelegator implements MediaResourc
sb.append('/').append(pakkage.getName().replace(".", "/")); sb.append('/').append(pakkage.getName().replace(".", "/"));
if(!location.startsWith("/")) sb.append('/'); if(!location.startsWith("/")) sb.append('/');
sb.append(location); sb.append(location);
this.url = getClass().getResource(sb.toString());
if(Settings.isDebuging() && StringHelper.containsNonWhitespace(WebappHelper.getSourcePath())) {
try {
this.url = new File(WebappHelper.getSourcePath(), sb.toString()).toURI().toURL();
} catch (MalformedURLException e) {
this.url = getClass().getResource(sb.toString());
}
} else {
this.url = getClass().getResource(sb.toString());
}
init(pakkage.getName()); init(pakkage.getName());
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment