From 9d188da0e606f75800cdc3c2c5db320b0b8a74a1 Mon Sep 17 00:00:00 2001 From: Manuel Bernhardt Date: Sun, 20 Nov 2011 13:06:11 +0100 Subject: [PATCH] Fixing path to scripts / links when press is disabled and the baseDir is / --- app/press/Plugin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/press/Plugin.java b/app/press/Plugin.java index 30383d3..44c26c7 100644 --- a/app/press/Plugin.java +++ b/app/press/Plugin.java @@ -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(); } @@ -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); @@ -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) @@ -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)