summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-01-16 13:02:45 +0200
committerVaadin Code Review <review@vaadin.com>2016-01-21 10:55:01 +0000
commit92c20d47b0ab867e3819ad2a0baeb7238c18f565 (patch)
treed6666b6664c2ccb123a01ba126310547008199d1 /client/src
parent62d3977c3bd2f63146eaf009db46d74a236e6214 (diff)
downloadvaadin-framework-92c20d47b0ab867e3819ad2a0baeb7238c18f565.tar.gz
vaadin-framework-92c20d47b0ab867e3819ad2a0baeb7238c18f565.zip
Do not process click events for disabled optiongroups (#19433)
This removes the warning logged on the server side when the RPC reaches it for the disabled component. As this is more of a cosmetic change, there is no automatic test. Change-Id: I8bfa83bd0a26c585e1614d821ac3b598294db09d
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/vaadin/client/ui/VOptionGroup.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/VOptionGroup.java b/client/src/com/vaadin/client/ui/VOptionGroup.java
index d429752069..9a28111dc5 100644
--- a/client/src/com/vaadin/client/ui/VOptionGroup.java
+++ b/client/src/com/vaadin/client/ui/VOptionGroup.java
@@ -207,7 +207,11 @@ public class VOptionGroup extends VOptionGroupBase implements FocusHandler,
super.onClick(event);
if (event.getSource() instanceof CheckBox) {
CheckBox source = (CheckBox) event.getSource();
-
+ if (!source.isEnabled()) {
+ // Click events on the text are received even though the
+ // checkbox is disabled
+ return;
+ }
if (BrowserInfo.get().isWebkit()) {
// Webkit does not focus non-text input elements on click
// (#11854)