commit 85570dfe7ecd445a9b7d26b2bbf68c9f59fb6f87
author jgw@google.com <jgw@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Jan 28 22:58:15 2009 +0000
committer jgw@google.com <jgw@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Jan 28 22:58:15 2009 +0000
tree 55349123d4a92134fb6928bf91650fa4a1a6bc1f
parent 4598c15fba4bb40e7c3bd7844805030ddbb35170

- Fixes Image to not fire an extra onload even when applying clipped image
  prototypes.
- Removes the redundant load listener test from
  ClippedImagePrototypeTest.testApplyToClippedImage().  (there was some
  cross-talk between the various load events triggered by each, and it was
  getting kind of silly.
TBR: rjrjr


git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4576 8db76d5a-ed1c-0410-87a9-c151d255dfc7

user/src/com/google/gwt/user/client/ui/Image.java

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 5fb3006..b33e4fb 100644
--- a/user/src/com/google/gwt/user/client/ui/Image.java
+++ b/user/src/com/google/gwt/user/client/ui/Image.java
@@ -116,7 +116,6 @@
       // common widget.After the branch is stable, this should be fixed.
       image.sinkEvents(Event.ONCLICK | Event.MOUSEEVENTS | Event.ONMOUSEWHEEL
           | Event.ONLOAD);
-      fireSyntheticLoadEvent(image);
     }
 
     @Override

user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java

diff --git a/user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java b/user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java
index e305a2e..7480a84 100644
--- a/user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java
+++ b/user/test/com/google/gwt/user/client/ui/impl/ClippedImagePrototypeTest.java
@@ -82,7 +82,6 @@
    * is called.
    */
   public void testApplyToClippedImage() {
-
     final Image image = new Image("counting-backwards.png", 12, 13, 8, 8);
 
     assertEquals(12, image.getOriginLeft());
@@ -91,27 +90,6 @@
     assertEquals(8, image.getHeight());
     assertEquals("clipped", ImageTest.getCurrentImageStateName(image));
 
-    final TestLoadListener listener = new TestLoadListener(image) {
-      @Override
-      public void onLoad(Widget sender) {
-        super.onLoad(sender);
-
-        if (image.getOriginLeft() == 12 && image.getOriginTop() == 13) {
-          ClippedImagePrototype clippedImagePrototype = new ClippedImagePrototype(
-              "counting-forwards.png", 16, 16, 16, 16);
-
-          clippedImagePrototype.applyTo(image);
-
-          assertEquals(16, image.getOriginLeft());
-          assertEquals(16, image.getOriginTop());
-          assertEquals(16, image.getWidth());
-          assertEquals(16, image.getHeight());
-          assertEquals("clipped", ImageTest.getCurrentImageStateName(image));
-        }
-      }
-    };
-    image.addLoadListener(listener);
-
     final TestLoadHandler handler = new TestLoadHandler() {
       @Override
       public void onLoad(LoadEvent event) {
@@ -137,14 +115,13 @@
         fail("The image " + image.getUrl() + " failed to load.");
       }
     });
-    
+
     RootPanel.get().add(image);
     delayTestFinish(2000);
 
     Timer t = new Timer() {
       @Override
       public void run() {
-        assertEquals(2, listener.getOnloadEventFireCount());
         assertEquals(2, handler.getOnloadEventFireCount());
         finishTest();
       }