Move theme name mangling to where it is actually desired (#9891)

Change-Id: Ia78d38c36e7f5f9c86e645f4afd2014cdc88cb32

2 files changed, 6 insertions, 5 deletions

diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java
index 9d668121a7..1432e1d5cc 100644
--- a/client/src/com/vaadin/client/ApplicationConfiguration.java
+++ b/client/src/com/vaadin/client/ApplicationConfiguration.java
@@ -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() {
diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index 2a72876924..a6c3b4cf2b 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -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());