Skip to content

Fixing path to links/scripts when press is turned off and the base path is / #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rore merged 1 commit into from
Nov 20, 2011
Merged

Fixing path to links/scripts when press is turned off and the base path is / #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/press/Plugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ public static String addSingleJS(String fileName, String dir, boolean compress)
}
} else {
if (null != dir && !dir.isEmpty())
src = dir + fileName;
src = (dir.equals("/") ? "" : dir) + fileName;
else
src = compressor.srcDir + fileName;
src = (compressor.srcDir.equals("/") ? "" : compressor.srcDir) + fileName;
if (press.PluginConfig.cacheBuster){
src += "?" + srcFile.lastModified();
}
Expand All @@ -80,7 +80,7 @@ public static String addSingleCSS(String fileName) {
src = requestKey;
}
} else {
src = compressor.srcDir + fileName;
src = (compressor.srcDir.equals("/") ? "" : compressor.srcDir) + fileName;
}

return getLinkTag(src);
Expand All @@ -102,7 +102,7 @@ public static String addJS(String src, boolean compress, int pos) {
if (performCompression()) {
result += compressor.add(fileName, compress, pos) + "\n";
} else {
String name = baseUrl + fileName;
String name = (baseUrl.equals("/") ? "" : baseUrl) + fileName;
if (press.PluginConfig.cacheBuster){
VirtualFile srcFile = checkJSFileExists(fileName, baseUrl);
if (null != srcFile)
Expand Down Expand Up @@ -131,7 +131,7 @@ public static String addCSS(String src, boolean compress, int pos) {
if (performCompression()) {
result += compressor.add(fileName, compress, pos) + "\n";
} else {
String name = baseUrl + fileName;
String name = (baseUrl.equals("/") ? "" : baseUrl) + fileName;
if (press.PluginConfig.cacheBuster){
VirtualFile srcFile = checkJSFileExists(fileName, baseUrl);
if (null != srcFile)
Expand Down