diff options
| author | Leif Åstrand <leif@vaadin.com> | 2013-06-04 13:05:42 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2013-06-04 13:05:43 +0300 |
| commit | a82d57ee336803359ba2a49aba80604c74c782e0 (patch) | |
| tree | cae7462c8037e3ae33b9e40eb54cfa791cef879c /client | |
| parent | 6c36784ad2853d0187f69ef8f023717aa7bade12 (diff) | |
| parent | 158c162d688fdfa701f9c6c9035e27d9f64a312f (diff) | |
| download | vaadin-framework-a82d57ee336803359ba2a49aba80604c74c782e0.tar.gz vaadin-framework-a82d57ee336803359ba2a49aba80604c74c782e0.zip | |
Merge changes from origin/7.0
b1390c5 Don't autoclose PopupView when changing fragment, fixes #10530
158c162 Do not clear combobox text unnecessarily (#10924, #11887)
Change-Id: I5cda623309d9e1b16ad09aa2a388552b5f33ca30
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VPopupView.java | 2 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/VPopupView.java b/client/src/com/vaadin/client/ui/VPopupView.java index 626780efee..dba4c8b092 100644 --- a/client/src/com/vaadin/client/ui/VPopupView.java +++ b/client/src/com/vaadin/client/ui/VPopupView.java @@ -103,6 +103,8 @@ public class VPopupView extends HTML implements Iterable<Widget> { }); popup.setAnimationEnabled(true); + + popup.setAutoHideOnHistoryEventsEnabled(false); } /** For internal use only. May be removed or replaced in the future. */ diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java index 345bdc0cbb..d9eac91e2b 100644 --- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java @@ -252,8 +252,11 @@ public class ComboBoxConnector extends AbstractFieldConnector implements getWidget().setPromptingOn(); } else { // we have focus in field, prompting can't be set on, instead - // just clear the input - getWidget().tb.setValue(""); + // just clear the input if the value has changed from something + // else to null + if (getWidget().selectedOptionKey != null) { + getWidget().tb.setValue(""); + } } getWidget().setSelectedItemIcon(null); getWidget().selectedOptionKey = null; |