diff options
| author | John Ahlroos <john@vaadin.com> | 2012-09-05 15:21:49 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-09-05 15:21:49 +0300 |
| commit | 7671871725ce03c356de17ad4ce58a7bfba0f7d6 (patch) | |
| tree | 7ade3d9aeb59b8847d3970e50ed7a80481b2ebef /client | |
| parent | e517a95a338d60bf8c63480b4a919f03ee2ff61b (diff) | |
| parent | 3e9874799d9b4940515fb203e2b57ac6a4212712 (diff) | |
| download | vaadin-framework-7671871725ce03c356de17ad4ce58a7bfba0f7d6.tar.gz vaadin-framework-7671871725ce03c356de17ad4ce58a7bfba0f7d6.zip | |
Merge branch 'master' into layoutgraph
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java b/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java index 6e5117cec6..cd985876df 100644 --- a/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java +++ b/client/src/com/vaadin/client/ui/twincolselect/VTwinColSelect.java @@ -226,8 +226,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, selections.setMultipleSelect(isMultiselect()); options.setEnabled(enabled); selections.setEnabled(enabled); - add.setEnabled(enabled); - remove.setEnabled(enabled); + add.setEnabled(enabled && !readonly); + remove.setEnabled(enabled && !readonly); options.clear(); selections.clear(); for (final Iterator<?> i = uidl.getChildIterator(); i.hasNext();) { @@ -247,6 +247,8 @@ public class VTwinColSelect extends VOptionGroupBase implements KeyDownHandler, } + add.setStyleName("v-disabled", readonly); + remove.setStyleName("v-disabled", readonly); } @Override |