diff options
| author | Artur Signell <artur@vaadin.com> | 2013-09-02 16:34:17 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2013-09-02 16:34:17 +0300 |
| commit | 831747a518be9e20b26ef47de95e0d1dccac16f8 (patch) | |
| tree | 1e4691d11d50215ea5dadebc30e60b6093cc18ea | |
| parent | faa256978731eaeda6930c18085fb28377700227 (diff) | |
| download | vaadin-framework-831747a518be9e20b26ef47de95e0d1dccac16f8.tar.gz vaadin-framework-831747a518be9e20b26ef47de95e0d1dccac16f8.zip | |
Fix regression where empty RTA returns <br> (#12490)
Change-Id: I273037644ed1383af84898cf03360e2b08d2647b
| -rw-r--r-- | client/src/com/vaadin/client/ui/VRichTextArea.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/ui/VRichTextArea.java b/client/src/com/vaadin/client/ui/VRichTextArea.java index 8a6ba3fc1e..34693ce392 100644 --- a/client/src/com/vaadin/client/ui/VRichTextArea.java +++ b/client/src/com/vaadin/client/ui/VRichTextArea.java @@ -399,19 +399,19 @@ public class VRichTextArea extends Composite implements Field, KeyPressHandler, BrowserInfo browser = BrowserInfo.get(); String result = getValue(); if (browser.isFirefox()) { - if ("<br>".equals(html)) { + if ("<br>".equals(result)) { result = ""; } } else if (browser.isWebkit()) { - if ("<div><br></div>".equals(html)) { + if ("<div><br></div>".equals(result)) { result = ""; } } else if (browser.isIE()) { - if ("<P> </P>".equals(html)) { + if ("<P> </P>".equals(result)) { result = ""; } } else if (browser.isOpera()) { - if ("<br>".equals(html) || "<p><br></p>".equals(html)) { + if ("<br>".equals(result) || "<p><br></p>".equals(result)) { result = ""; } } |