summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2016-01-16 13:02:45 +0200
committerelmot <elmot@vaadin.com>2016-01-21 17:12:34 +0200
commit99899fa80d167f3eb6ed62960dfd7d81e002bbf7 (patch)
tree2b2022f979cda6affcb8676bbafbc7267e022935 /client/src
parent81b016a0cde928200bf0ae6241603d0f97396dc5 (diff)
downloadvaadin-framework-99899fa80d167f3eb6ed62960dfd7d81e002bbf7.tar.gz
vaadin-framework-99899fa80d167f3eb6ed62960dfd7d81e002bbf7.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: Ia010c07fe277411a6ea3edcacb7a016d66b6807f
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)