Fixed javascript that was breaking the colorpicker.

Added to esh per request from @teichsta. See PR #4021.
eclipse-archived · Feb 12, 2016 · 6d0d7cd · 6d0d7cd
1 parent a6511fb
commit 6d0d7cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/...sic/src/main/java/org/eclipse/smarthome/ui/basic/internal/render/ColorpickerRenderer.java b/...sic/src/main/java/org/eclipse/smarthome/ui/basic/internal/render/ColorpickerRenderer.java
@@ -65,6 +65,7 @@ public EList<Widget> renderWidget(Widget w, StringBuilder sb) throws RenderExcep
         }
         String label = getLabel(cp);
         String purelabel = itemUIRegistry.getLabel(w);
+        purelabel = purelabel.replaceAll("\\\"", "\\\\'");
 
         snippet = StringUtils.replace(snippet, "%id%", itemUIRegistry.getWidgetId(cp));
         snippet = StringUtils.replace(snippet, "%category%", getCategory(w));

diff --git a/...c/src/main/java/org/eclipse/smarthome/ui/classic/internal/render/ColorpickerRenderer.java b/...c/src/main/java/org/eclipse/smarthome/ui/classic/internal/render/ColorpickerRenderer.java
@@ -64,6 +64,7 @@ public EList<Widget> renderWidget(Widget w, StringBuilder sb) throws RenderExcep
         }
         String label = getLabel(cp);
         String purelabel = itemUIRegistry.getLabel(w);
+        purelabel = purelabel.replaceAll("\\\"", "\\\\'");
 
         snippet = StringUtils.replace(snippet, "%id%", itemUIRegistry.getWidgetId(cp));
         snippet = StringUtils.replace(snippet, "%category%", escapeURLPath(itemUIRegistry.getCategory(cp)));