diff options
| author | Artur Signell <artur.signell@itmill.com> | 2008-12-19 14:55:49 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2008-12-19 14:55:49 +0000 |
| commit | 4671012a6a0ff31a555916b9425a61fb07bc5bbc (patch) | |
| tree | 1903f33ed01b8294323eb1ca991b1254e0406df9 /src/com/itmill | |
| parent | d8d18161702d8b5f58bba851cbd6581900dddf26 (diff) | |
| download | vaadin-framework-4671012a6a0ff31a555916b9425a61fb07bc5bbc.tar.gz vaadin-framework-4671012a6a0ff31a555916b9425a61fb07bc5bbc.zip | |
Fix for #2396 - loading indicator stays on in IE7
svn changeset:6308/svn branch:trunk
Diffstat (limited to 'src/com/itmill')
| -rwxr-xr-x | src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java index b2572e8ad0..fc3851fee9 100755 --- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java @@ -419,7 +419,15 @@ public class ApplicationConnection { loadTimer = new Timer() { @Override public void run() { - showLoadingIndicator(); + /* + * IE7 does not properly cancel the event with + * loadTimer.cancel() so we have to check that we really + * should make it visible + */ + if (loadTimer != null) { + showLoadingIndicator(); + } + } }; // First one kicks in at 300ms |