summaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/terminal
diff options
context:
space:
mode:
authorJohn Alhroos <john.ahlroos@itmill.com>2011-03-04 15:39:17 +0000
committerJohn Alhroos <john.ahlroos@itmill.com>2011-03-04 15:39:17 +0000
commitd295e5a71af8c9281c1982f79bb96ec832729966 (patch)
tree7426e71923997c9bba7650225cae21ecbdaba190 /src/com/vaadin/terminal
parent8101a83b54b5d0790f00fc6e26841d77b827311c (diff)
downloadvaadin-framework-d295e5a71af8c9281c1982f79bb96ec832729966.tar.gz
vaadin-framework-d295e5a71af8c9281c1982f79bb96ec832729966.zip
Fix for #4285 : Blur event prevention mechanism for IE prevented focus from moving to another field when first focusing the field, then opening the popup dialog and the clicking on another field. This fixed by only preventing the blur event if we already have focus.
svn changeset:17623/svn branch:6.5
Diffstat (limited to 'src/com/vaadin/terminal')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index da5f879315..66adc39d63 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -730,7 +730,6 @@ public class VFilterSelect extends Composite implements Paintable, Field,
/**
* Used when measuring the width of the popup
*/
-
private final HTML popupOpener = new HTML("") {
/*
@@ -1709,8 +1708,11 @@ public class VFilterSelect extends Composite implements Paintable, Field,
/*
* In IE the above wont work, the blur event will still trigger. So,
* we set a flag here to prevent the next blur event from happening.
+ * This is not needed if do not already have focus, in that case
+ * there will not be any blur event and we should not cancel the
+ * next blur.
*/
- if (BrowserInfo.get().isIE()) {
+ if (BrowserInfo.get().isIE() && focused) {
preventNextBlurEventInIE = true;
}
}