diff options
| author | Maciej PrzepioĢra <matthew@vaadin.com> | 2015-09-16 10:48:31 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-09-24 07:46:38 +0000 |
| commit | 5c875228d9025f4c779ffc26c3eb0f7b561061e5 (patch) | |
| tree | 2e3a0d230478ef7d9090db31597e440f3f1738e7 /server/src/com/vaadin/ui/TextArea.java | |
| parent | 8006d359acce4fb31e7210ed2f20f1da3d7a1cd0 (diff) | |
| download | vaadin-framework-5c875228d9025f4c779ffc26c3eb0f7b561061e5.tar.gz vaadin-framework-5c875228d9025f4c779ffc26c3eb0f7b561061e5.zip | |
Support HTML entities when reading/writing declarative format #18882
Change-Id: I08099673c5dd0d688d3243e5fd169edb05f046f3
Diffstat (limited to 'server/src/com/vaadin/ui/TextArea.java')
| -rw-r--r-- | server/src/com/vaadin/ui/TextArea.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/src/com/vaadin/ui/TextArea.java b/server/src/com/vaadin/ui/TextArea.java index b4dfb209e8..75ecc19d40 100644 --- a/server/src/com/vaadin/ui/TextArea.java +++ b/server/src/com/vaadin/ui/TextArea.java @@ -21,6 +21,7 @@ import org.jsoup.nodes.Element; import com.vaadin.data.Property; import com.vaadin.shared.ui.textarea.TextAreaState; import com.vaadin.ui.declarative.DesignContext; +import com.vaadin.ui.declarative.DesignFormatter; /** * A text field that supports multi line editing. @@ -145,7 +146,7 @@ public class TextArea extends AbstractTextField { @Override public void readDesign(Element design, DesignContext designContext) { super.readDesign(design, designContext); - setValue(design.html()); + setValue(DesignFormatter.unencodeFromTextNode(design.html())); } /* @@ -157,7 +158,7 @@ public class TextArea extends AbstractTextField { @Override public void writeDesign(Element design, DesignContext designContext) { super.writeDesign(design, designContext); - design.html(getValue()); + design.html(DesignFormatter.encodeForTextNode(getValue())); } @Override |