Fixes issue 3340 by preventing IE race condition from occurring when the on load handler is set.
Review by:jlabanca
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4656 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/src/com/google/gwt/user/client/ui/Image.java b/user/src/com/google/gwt/user/client/ui/Image.java
index f6af018..e3bc47e 100644
--- a/user/src/com/google/gwt/user/client/ui/Image.java
+++ b/user/src/com/google/gwt/user/client/ui/Image.java
@@ -64,10 +64,7 @@
* will be lost.
* </p>
*
- * <h3>CSS Style Rules</h3>
- * <ul class="css">
- * <li>.gwt-Image { }</li>
- * </ul>
+ * <h3>CSS Style Rules</h3> <ul class="css"> <li>.gwt-Image { }</li> </ul>
*
* Tranformations between clipped and unclipped state will result in a loss of
* any style names that were set/added; the only style names that are preserved
@@ -225,16 +222,20 @@
private static class UnclippedState extends State {
UnclippedState(Element element) {
- // Todo(ecc) This is wrong, we should not be sinking these here on such a
- // common widget.After the branch is stable, this should be fixed.
+ // This case is relatively unusual, in that we swapped a clipped image
+ // out, so does not need to be efficient.
Event.sinkEvents(element, Event.ONCLICK | Event.MOUSEEVENTS
| Event.ONLOAD | Event.ONERROR | Event.ONMOUSEWHEEL);
}
UnclippedState(Image image) {
image.replaceElement(Document.get().createImageElement());
- // Todo(ecc) This is wrong, we should not be sinking these here on such a
- // common widget.After the branch is stable, this should be fixed.
+ // We are working around an IE race condition that can make the image
+ // incorrectly cache itself if the load event is assigned at the same time
+ // as the image is added to the dom.
+ Event.sinkEvents(image.getElement(), Event.ONLOAD);
+
+ // Todo(ecc) this could be more efficient overall.
image.sinkEvents(Event.ONCLICK | Event.MOUSEEVENTS | Event.ONLOAD
| Event.ONERROR | Event.ONMOUSEWHEEL);
}
