diff options
| author | John Alhroos <john.ahlroos@itmill.com> | 2011-06-22 11:46:23 +0000 |
|---|---|---|
| committer | John Alhroos <john.ahlroos@itmill.com> | 2011-06-22 11:46:23 +0000 |
| commit | 9cf4a1b2ee8bd9b38c48261230b45d52408e6799 (patch) | |
| tree | f1316633ae7f72d4dc57243afc7a779f97dfadb4 /src | |
| parent | b5218c45503cd5936062dd26ae94928dc2bc7246 (diff) | |
| download | vaadin-framework-9cf4a1b2ee8bd9b38c48261230b45d52408e6799.tar.gz vaadin-framework-9cf4a1b2ee8bd9b38c48261230b45d52408e6799.zip | |
Fixed issue with file upload dialog not closing when selecting file #7135
svn changeset:19499/svn branch:6.6
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VUpload.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java index 206b89eb82..a49450e086 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java @@ -1,4 +1,4 @@ -/* +/* @ITMillApache2LicenseForJavaFiles@ */ @@ -22,6 +22,7 @@ import com.google.gwt.user.client.ui.Hidden; import com.google.gwt.user.client.ui.Panel; import com.google.gwt.user.client.ui.SimplePanel; import com.vaadin.terminal.gwt.client.ApplicationConnection; +import com.vaadin.terminal.gwt.client.BrowserInfo; import com.vaadin.terminal.gwt.client.Paintable; import com.vaadin.terminal.gwt.client.UIDL; import com.vaadin.terminal.gwt.client.VConsole; @@ -44,7 +45,8 @@ public class VUpload extends SimplePanel implements Paintable { && !"".equals(fu.getFilename())) { submit(); } - } else if (event.getTypeInt() == Event.ONFOCUS) { + } else if (BrowserInfo.get().isIE() + && event.getTypeInt() == Event.ONFOCUS) { // IE and user has clicked on hidden textarea part of upload // field. Manually open file selector, other browsers do it by // default. |