From 99899fa80d167f3eb6ed62960dfd7d81e002bbf7 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Sat, 16 Jan 2016 13:02:45 +0200 Subject: [PATCH] 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 --- .../com/vaadin/client/ui/VOptionGroup.java | 6 ++- .../optiongroup/OptionGroupDisabled.java | 37 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java 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) diff --git a/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java new file mode 100644 index 0000000000..f16bd4b7dd --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/optiongroup/OptionGroupDisabled.java @@ -0,0 +1,37 @@ +/* + * Copyright 2000-2014 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.components.optiongroup; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUIWithLog; +import com.vaadin.ui.OptionGroup; + +public class OptionGroupDisabled extends AbstractTestUIWithLog { + + @Override + protected void setup(VaadinRequest request) { + OptionGroup optionGroup = new OptionGroup(); + optionGroup.setEnabled(false); + optionGroup.setImmediate(true); + optionGroup.setMultiSelect(true); + optionGroup.addItem("test 1"); + optionGroup.addItem("test 2"); + optionGroup.addItem("test 3"); + + addComponent(optionGroup); + } + +} -- 2.39.5