HtmlImage: fix Image.onload() being called immediately instead of later

Author: duonglaiquang

src/main/java/org/htmlunit/html/DomElement.java

@@ -1000,51 +1000,57 @@ public <P extends Page> P click(final boolean shiftKey, final boolean ctrlKey, f
                 mouseDown(shiftKey, ctrlKey, altKey, MouseEvent.BUTTON_LEFT);
             }
 
-            if (handleFocus) {
-                // give focus to current element (if possible) or only remove it from previous one
-                DomElement elementToFocus = null;
-                if (this instanceof SubmittableElement
-                    || this instanceof HtmlAnchor
-                        && ATTRIBUTE_NOT_DEFINED != ((HtmlAnchor) this).getHrefAttribute()
-                    || this instanceof HtmlArea
-                        && (ATTRIBUTE_NOT_DEFINED != ((HtmlArea) this).getHrefAttribute()
-                            || getPage().getWebClient().getBrowserVersion().hasFeature(JS_AREA_WITHOUT_HREF_FOCUSABLE))
-                    || this instanceof HtmlElement && ((HtmlElement) this).getTabIndex() != null) {
-                    elementToFocus = this;
-                }
-                else if (this instanceof HtmlOption) {
-                    elementToFocus = ((HtmlOption) this).getEnclosingSelect();
-                }
+            final JavaScriptEngine jsEngine = (JavaScriptEngine)page.getWebClient().getJavaScriptEngine();
+            jsEngine.holdPosponedActions();
+            try {
+                if (handleFocus) {
+                    // give focus to current element (if possible) or only remove it from previous one
+                    DomElement elementToFocus = null;
+                    if (this instanceof SubmittableElement
+                        || this instanceof HtmlAnchor
+                            && ATTRIBUTE_NOT_DEFINED != ((HtmlAnchor)this).getHrefAttribute()
+                        || this instanceof HtmlArea
+                            && (ATTRIBUTE_NOT_DEFINED != ((HtmlArea)this).getHrefAttribute()
+                                || getPage().getWebClient().getBrowserVersion().hasFeature(JS_AREA_WITHOUT_HREF_FOCUSABLE))
+                        || this instanceof HtmlElement && ((HtmlElement)this).getTabIndex() != null) {
+                        elementToFocus = this;
+                    }
+                    else if (this instanceof HtmlOption) {
+                        elementToFocus = ((HtmlOption)this).getEnclosingSelect();
+                    }
 
-                if (elementToFocus == null) {
-                    ((HtmlPage) page).setFocusedElement(null);
-                }
-                else {
-                    elementToFocus.focus();
+                    if (elementToFocus == null) {
+                        ((HtmlPage)page).setFocusedElement(null);
+                    }
+                    else {
+                        elementToFocus.focus();
+                    }
                 }
-            }
 
-            if (triggerMouseEvents) {
-                mouseUp(shiftKey, ctrlKey, altKey, MouseEvent.BUTTON_LEFT);
-            }
-
-            MouseEvent event = null;
-            if (page.getWebClient().isJavaScriptEnabled()) {
-                final BrowserVersion browser = page.getWebClient().getBrowserVersion();
-                if (browser.hasFeature(EVENT_ONCLICK_USES_POINTEREVENT)) {
-                    event = new PointerEvent(getEventTargetElement(), MouseEvent.TYPE_CLICK, shiftKey,
-                            ctrlKey, altKey, MouseEvent.BUTTON_LEFT, 1);
-                }
-                else {
-                    event = new MouseEvent(getEventTargetElement(), MouseEvent.TYPE_CLICK, shiftKey,
-                            ctrlKey, altKey, MouseEvent.BUTTON_LEFT, 1);
+                if (triggerMouseEvents) {
+                    mouseUp(shiftKey, ctrlKey, altKey, MouseEvent.BUTTON_LEFT);
                 }
 
-                if (disableProcessLabelAfterBubbling) {
-                    event.disableProcessLabelAfterBubbling();
+                MouseEvent event = null;
+                if (page.getWebClient().isJavaScriptEnabled()) {
+                    final BrowserVersion browser = page.getWebClient().getBrowserVersion();
+                    if (browser.hasFeature(EVENT_ONCLICK_USES_POINTEREVENT)) {
+                        event = new PointerEvent(getEventTargetElement(), MouseEvent.TYPE_CLICK, shiftKey,
+                                ctrlKey, altKey, MouseEvent.BUTTON_LEFT, 1);
+                    }
+                    else {
+                        event = new MouseEvent(getEventTargetElement(), MouseEvent.TYPE_CLICK, shiftKey,
+                                ctrlKey, altKey, MouseEvent.BUTTON_LEFT, 1);
+                    }
+
+                    if (disableProcessLabelAfterBubbling) {
+                        event.disableProcessLabelAfterBubbling();
+                    }
                 }
+                return click(event, shiftKey, ctrlKey, altKey, ignoreVisibility);
+            } finally {
+                jsEngine.processPostponedActions();
             }
-            return click(event, shiftKey, ctrlKey, altKey, ignoreVisibility);
         }
     }
 

src/main/java/org/htmlunit/html/HtmlImage.java

@@ -41,6 +41,7 @@
 import org.htmlunit.WebClient;
 import org.htmlunit.WebRequest;
 import org.htmlunit.WebResponse;
+import org.htmlunit.javascript.JavaScriptEngine;
 import org.htmlunit.javascript.PostponedAction;
 import org.htmlunit.javascript.host.dom.Document;
 import org.htmlunit.javascript.host.event.Event;
@@ -312,7 +313,19 @@ public void execute() {
                 htmlPage.addAfterLoadAction(action);
             }
             else {
-                fireEvent(event);
+                JavaScriptEngine jsEngine = (JavaScriptEngine) client.getJavaScriptEngine();
+                if (jsEngine.isScriptRunning()) {
+                    final PostponedAction action = new PostponedAction(getPage(), "HtmlImage.doOnLoad") {
+                        @Override
+                        public void execute() {
+                            HtmlImage.this.fireEvent(event);
+                        }
+                    };
+                    jsEngine.addPostponedAction(action);
+                }
+                else {
+                    fireEvent(event);
+                }
             }
         }
     }

src/test/java/org/htmlunit/html/HtmlImageTest.java

@@ -317,4 +317,39 @@ public void clickWithCoordinates() throws Exception {
         img.click(2, 7);
         assertEquals(getExpectedAlerts()[0] + getExpectedAlerts()[1], page.getTitleText());
     }
+
+    /**
+     * @throws Exception on test failure
+     */
+    @Test
+    @Alerts({"in-out-Image.onload(0)-", "mousedown-in-out-Image.onload(1)-mouseup-in-out-click-in-out-Image.onload(2)-Image.onload(3)-"})
+    public void onload() throws Exception {
+        final String html =
+                "<html>\n"
+                + "<head>\n"
+                + "<script>\n"
+                + "  function log(msg) { window.document.title += msg + '-';}\n"
+                + "  function test(i) {\n"
+                + "    log('in');\n"
+                + "    var image = new Image();\n"
+                + "    image.onload = function () { log(\"Image.onload(\" + i + \")\") };\n"
+                + "    image.src = '4x7.jpg';\n"
+                + "    log('out');\n"
+                + "  }\n"
+                + "</script>\n"
+                + "</head>\n"
+                + "<body onload=\"test(0)\">\n"
+                + "<button onmousedown=\"log('mousedown'); test(1)\""
+                + "        onmouseup=\"log('mouseup'); test(2)\""
+                + "        onclick=\"log('click'); test(3)\"></button>\n"
+                + "</body>\n"
+                + "</html>\n";
+
+        final HtmlPage page = loadPage(html);
+        assertEquals(getExpectedAlerts()[0], page.getTitleText());
+
+        page.setTitleText("");
+        page.<HtmlButton>getFirstByXPath("//button").click();
+        assertEquals(getExpectedAlerts()[1], page.getTitleText());
+    }
 }