diff options
| author | Artur Signell <artur@vaadin.com> | 2013-06-18 21:22:09 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-06-24 22:11:26 +0300 |
| commit | 15c9eb5b393ec08aa9b3be849dfb394916cd5535 (patch) | |
| tree | 7ed53bfc1a2039799731d2c5b9310bf6f4c91e69 /client | |
| parent | e6cfd3ae001bc870a1480ef9e9c729e1b11fe5ef (diff) | |
| download | vaadin-framework-15c9eb5b393ec08aa9b3be849dfb394916cd5535.tar.gz vaadin-framework-15c9eb5b393ec08aa9b3be849dfb394916cd5535.zip | |
Enable using @Stylesheet with vaadin:// (#9934)
Change-Id: I895fad31ef5b31a395cea95e64d6b183d718056f
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ApplicationConnection.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index d873cc8dc6..236417f23b 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -2940,6 +2940,14 @@ public class ApplicationConnection { uidlUri = serviceUrl + relativeUrl; } } + if (uidlUri.startsWith(ApplicationConstants.VAADIN_PROTOCOL_PREFIX)) { + final String vaadinUri = configuration.getVaadinDirUrl(); + String relativeUrl = uidlUri + .substring(ApplicationConstants.VAADIN_PROTOCOL_PREFIX + .length()); + uidlUri = vaadinUri + relativeUrl; + } + return uidlUri; } |