From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 8 Jan 2009 07:19:14 +0000 (+0000)
Subject: using setText instead of setHTML for preformatted text, see #2426
X-Git-Tag: 6.7.0.beta1~3400
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ce86992d5d1ff21c4fc2c601ca6ac55798c1bd9d;p=vaadin-framework.git

using setText instead of setHTML for preformatted text, see #2426

svn changeset:6440/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java
index 20e529dfd3..f3bec455f0 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILabel.java
@@ -4,8 +4,10 @@
 
 package com.itmill.toolkit.terminal.gwt.client.ui;
 
+import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NodeList;
+import com.google.gwt.dom.client.PreElement;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.HTML;
@@ -61,7 +63,12 @@ public class ILabel extends HTML implements Paintable {
         if (mode == null || "text".equals(mode)) {
             setText(uidl.getChildString(0));
         } else if ("pre".equals(mode)) {
-            setHTML(uidl.getChildrenAsXML());
+            PreElement preElement = Document.get().createPreElement();
+            preElement.setInnerText(uidl.getChildUIDL(0).getChildString(0));
+            // clear existing content
+            setHTML("");
+            // add preformatted text to dom
+            getElement().appendChild(preElement);
         } else if ("uidl".equals(mode)) {
             setHTML(uidl.getChildrenAsXML());
         } else if ("xhtml".equals(mode)) {