fix Ticket #10506, remove quotes in url path

taking single quote into consideration

Change-Id: I966ffeba8a60c7c16980cca3dfa69935e0aca67b

diff --git a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
index 1ba1072767d10fc62720a38db30300efbac79f62..67e6df6383d4290f830c7afb8b77ee37b3d0c61a 100644 (file)
--- a/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
+++ b/theme-compiler/src/com/vaadin/sass/internal/visitor/ImportNodeHandler.java
@@ -100,7 +100,9 @@ public class ImportNodeHandler {
                 LexicalUnit value = ((RuleNode) child).getValue();
                 while (value != null) {
                     if (value.getLexicalUnitType() == LexicalUnit.SAC_URI) {
-                        String path = value.getStringValue();
+                        String path = value.getStringValue()
+                                .replaceAll("^\"|\"$", "")
+                                .replaceAll("^'|'$", "");
                         if (!path.startsWith("/") && !path.contains(":")) {
                             path = prefix + path;
                             path = StringUtil.cleanPath(path);

diff --git a/theme-compiler/tests/resources/automatic/css/url-path.css b/theme-compiler/tests/resources/automatic/css/url-path.css
new file mode 100644 (file)
index 0000000..1045948
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/css/url-path.css
@@ -0,0 +1,5 @@
+.bar {
+    background: url(foo/lorem.png);
+    background: url(foo/lorem.png);
+    background: url(foo/lorem.png);
+}
\ No newline at end of file

diff --git a/theme-compiler/tests/resources/automatic/scss/foo/bar.scss b/theme-compiler/tests/resources/automatic/scss/foo/bar.scss
new file mode 100644 (file)
index 0000000..326d342
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/foo/bar.scss
@@ -0,0 +1,5 @@
+.bar {
+   background: url("lorem.png");
+   background: url('lorem.png');
+   background: url(lorem.png);
+}
\ No newline at end of file

diff --git a/theme-compiler/tests/resources/automatic/scss/url-path.scss b/theme-compiler/tests/resources/automatic/scss/url-path.scss
new file mode 100644 (file)
index 0000000..0cc954b
--- /dev/null
+++ b/theme-compiler/tests/resources/automatic/scss/url-path.scss
@@ -0,0 +1 @@
+@import "foo/bar.scss";
\ No newline at end of file