diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2011-04-21 16:55:02 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2011-04-21 16:55:02 +0000 |
| commit | 977f9747b5c78c285c41b80a06713eb7f4592ef4 (patch) | |
| tree | 59253a27ac2665a71d862ade73877f8a9933529a | |
| parent | 247d994f155d4933cd7935e6b880233ae9de6aea (diff) | |
| download | vaadin-framework-977f9747b5c78c285c41b80a06713eb7f4592ef4.tar.gz vaadin-framework-977f9747b5c78c285c41b80a06713eb7f4592ef4.zip | |
fixes #6874
svn changeset:18436/svn branch:6.6
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java index 623bd1bf1b..64c2ecabd5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java @@ -22,6 +22,7 @@ import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.PopupPanel;
import com.google.gwt.user.client.ui.PopupPanel.PositionCallback;
import com.vaadin.terminal.gwt.client.ApplicationConnection;
+import com.vaadin.terminal.gwt.client.BrowserInfo;
import com.vaadin.terminal.gwt.client.DateTimeService;
import com.vaadin.terminal.gwt.client.Paintable;
import com.vaadin.terminal.gwt.client.UIDL;
@@ -335,7 +336,13 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field, public void onClose(CloseEvent<PopupPanel> event) {
if (event.getSource() == popup) {
buildDate();
- focus();
+ if (!BrowserInfo.get().isTouchDevice()) {
+ /*
+ * Move focus to textbox, unless on touch device (avoids opening
+ * virtual keyboard).
+ */
+ focus();
+ }
// TODO resolve what the "Sigh." is all about and document it here
// Sigh.
|