Change-Id: Ia78d38c36e7f5f9c86e645f4afd2014cdc88cb32tags/7.0.0.beta6
@@ -254,9 +254,7 @@ public class ApplicationConfiguration implements EntryPoint { | |||
} | |||
public String getThemeName() { | |||
String themeName = getJsoConfiguration(id).getConfigString("theme"); | |||
themeName = themeName.replaceAll("[^a-zA-Z0-9]", ""); | |||
return themeName; | |||
return getJsoConfiguration(id).getConfigString("theme"); | |||
} | |||
public String getThemeUri() { |
@@ -300,8 +300,11 @@ public class UIConnector extends AbstractComponentContainerConnector implements | |||
// the user | |||
root.getElement().setInnerHTML(""); | |||
root.addStyleName("v-theme-" | |||
+ applicationConnection.getConfiguration().getThemeName()); | |||
String themeName = applicationConnection.getConfiguration() | |||
.getThemeName(); | |||
// Remove chars that are not suitable for style names | |||
themeName = themeName.replaceAll("[^a-zA-Z0-9]", ""); | |||
root.addStyleName("v-theme-" + themeName); | |||
root.add(getWidget()); | |||