From 3ffb27fa734195f103fdbfb5ad6c81d7a8b006f7 Mon Sep 17 00:00:00 2001 From: Anastasia Smirnova Date: Fri, 20 Apr 2018 09:59:44 +0300 Subject: Fix RichTextArea read-only+disabled Resolves #10541 --- client/src/main/java/com/vaadin/client/ui/VRichTextArea.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java index 4f436bf51d..1ed07c4cec 100644 --- a/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java +++ b/client/src/main/java/com/vaadin/client/ui/VRichTextArea.java @@ -163,8 +163,8 @@ public class VRichTextArea extends Composite implements Field, KeyPressHandler, public void setEnabled(boolean enabled) { if (this.enabled != enabled) { // rta.setEnabled(enabled); - swapEditableArea(); this.enabled = enabled; + swapEditableArea(); } } @@ -179,6 +179,9 @@ public class VRichTextArea extends Composite implements Field, KeyPressHandler, private void swapEditableArea() { String value = getValue(); if (html.isAttached()) { + if (isReadOnly() || !isEnabled()) { + return; + } fp.remove(html); if (BrowserInfo.get().isWebkit()) { fp.remove(formatter); @@ -218,8 +221,8 @@ public class VRichTextArea extends Composite implements Field, KeyPressHandler, public void setReadOnly(boolean b) { if (isReadOnly() != b) { - swapEditableArea(); readOnly = b; + swapEditableArea(); } // reset visibility in case enabled state changed and the formatter was // recreated -- cgit v1.2.3