diff options
author | Artur <artur@vaadin.com> | 2017-08-11 16:07:51 +0300 |
---|---|---|
committer | Henri Sara <henri.sara@gmail.com> | 2017-08-11 16:07:51 +0300 |
commit | 0f64ae445bae3c6e7a0d7fee1b6db9717e3da59a (patch) | |
tree | 8dcc6f1fdbb0fccdba652fe017beb04650b11681 /client | |
parent | 1f878089dec6c03090efbcc79b08edbfbffb7620 (diff) | |
download | vaadin-framework-0f64ae445bae3c6e7a0d7fee1b6db9717e3da59a.tar.gz vaadin-framework-0f64ae445bae3c6e7a0d7fee1b6db9717e3da59a.zip |
Do not wait for icons to load before interacting with a combo box (#9717)
Icon load detection code does not handle error events so broken images
will cause tests to fail forever. In other cases also, it seems very
rare to need icons to be loaded before interacting with a combo box. If
there really are use cases for this, it would be better to have a method
to query if all icons are loaded so that special tests can use this method.
Fixes https://github.com/vaadin/testbench/issues/916
Diffstat (limited to 'client')
-rw-r--r-- | client/src/main/java/com/vaadin/client/ui/VComboBox.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/VComboBox.java b/client/src/main/java/com/vaadin/client/ui/VComboBox.java index 61e9b46e68..bb75385007 100644 --- a/client/src/main/java/com/vaadin/client/ui/VComboBox.java +++ b/client/src/main/java/com/vaadin/client/ui/VComboBox.java @@ -1989,12 +1989,10 @@ public class VComboBox extends Composite implements Field, KeyDownHandler, ClickEvent.getType()); selectedItemIcon.addDomHandler(VComboBox.this, MouseDownEvent.getType()); - iconUpdating = true; selectedItemIcon.addDomHandler(new LoadHandler() { @Override public void onLoad(LoadEvent event) { afterSelectedItemIconChange(); - iconUpdating = false; } }, LoadEvent.getType()); panel.insert(selectedItemIcon, 0); @@ -2449,7 +2447,6 @@ public class VComboBox extends Composite implements Field, KeyDownHandler, boolean preventNextBlurEventInIE = false; private String explicitSelectedCaption; - private boolean iconUpdating = false; /* * (non-Javadoc) @@ -2709,7 +2706,7 @@ public class VComboBox extends Composite implements Field, KeyDownHandler, @Override public boolean isWorkPending() { return dataReceivedHandler.isWaitingForFilteringResponse() - || suggestionPopup.lazyPageScroller.isRunning() || iconUpdating; + || suggestionPopup.lazyPageScroller.isRunning(); } /** |