diff options
| author | Artur Signell <artur@vaadin.com> | 2013-05-03 08:57:24 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-05-03 08:57:24 +0300 |
| commit | 68d3f0ac04fb945f8f2ca2b60b75d65485f98f7a (patch) | |
| tree | 8e06c7ec387add4809cd2c96357e9a891247795a /theme-compiler/src/com/vaadin/sass | |
| parent | f7e41e74bf3dbd9aae15aca90ba08cb0f3c9b61a (diff) | |
| download | vaadin-framework-68d3f0ac04fb945f8f2ca2b60b75d65485f98f7a.tar.gz vaadin-framework-68d3f0ac04fb945f8f2ca2b60b75d65485f98f7a.zip | |
Fixed scss file resolving issue in Windows (#11762)
Change-Id: I63484865ce56a54cc8f3fb673c03ffd0be6c8dc1
Diffstat (limited to 'theme-compiler/src/com/vaadin/sass')
| -rw-r--r-- | theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java b/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java index 2460c2ad2e..d6480f3e2c 100644 --- a/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java +++ b/theme-compiler/src/com/vaadin/sass/internal/resolver/VaadinResolver.java @@ -15,6 +15,7 @@ */ package com.vaadin.sass.internal.resolver; +import java.io.File; import java.net.URI; import java.net.URISyntaxException; @@ -29,6 +30,9 @@ public class VaadinResolver implements ScssStylesheetResolver { * Normalize classpath so ../../ segments are resolved */ try { + // Ensure only "/" is used, also in Windows + identifier = identifier.replace(File.separatorChar, '/'); + // Resolve "foo/../bar" -> "bar" identifier = new URI(identifier).normalize().getPath(); } catch (URISyntaxException e) { // No worries, continuing with the unnormalized path and hope for |