diff options
| author | Automerge <automerge@vaadin.com> | 2012-02-13 09:45:38 +0000 |
|---|---|---|
| committer | Automerge <automerge@vaadin.com> | 2012-02-13 09:45:38 +0000 |
| commit | e30dd1df30163aae265ff1eb80c2ef04fc8349f6 (patch) | |
| tree | be1119809e1d2be04574a827230ab11abafc5706 /src/com/vaadin | |
| parent | bec9a1e9656bf6a0d32f2e90e73fbbb3e87ba7e3 (diff) | |
| download | vaadin-framework-e30dd1df30163aae265ff1eb80c2ef04fc8349f6.tar.gz vaadin-framework-e30dd1df30163aae265ff1eb80c2ef04fc8349f6.zip | |
[merge from 6.7] #8362 Ensure value is not toggled when checkbox is disabled
svn changeset:22978/svn branch:6.8
Diffstat (limited to 'src/com/vaadin')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java index c43c4d3dba..b1eda728dc 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VCheckBox.java @@ -162,7 +162,10 @@ public class VCheckBox extends com.google.gwt.user.client.ui.CheckBox implements public void onBrowserEvent(Event event) { if (icon != null && (event.getTypeInt() == Event.ONCLICK) && (DOM.eventGetTarget(event) == icon.getElement())) { - setValue(!getValue()); + // Click on icon should do nothing if widget is disabled + if (isEnabled()) { + setValue(!getValue()); + } } super.onBrowserEvent(event); if (event.getTypeInt() == Event.ONLOAD) { |