From 56b521a1258f7b9657c9f7dda0878b789d39f59b Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 28 Nov 2012 18:53:11 +0000 Subject: make window load event delivery work --- javascript/jsapi/window.bnd | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) (limited to 'javascript/jsapi') diff --git a/javascript/jsapi/window.bnd b/javascript/jsapi/window.bnd index 3f8930441..610aa71ab 100644 --- a/javascript/jsapi/window.bnd +++ b/javascript/jsapi/window.bnd @@ -28,6 +28,7 @@ preamble %{ #include "javascript/jsapi.h" #include "javascript/jsapi/binding.h" + %} binding window { @@ -227,26 +228,31 @@ operation dispatchEvent %{ if (event == JSVAL_VOID) { jsret = JS_FALSE; } else { - dom_event *domevent; - dom_string *type_dom; + struct { + dom_event *event; + } *event_private; + dom_string *type_dom = NULL; dom_exception exc; jsval eventval = JSVAL_VOID; jsval event_argv[1]; jsval event_rval; - domevent = JS_GetInstancePrivate(cx, event, &JSClass_Event, NULL); - if (domevent == NULL) { + event_private = JS_GetInstancePrivate(cx, event, &JSClass_Event, NULL); + if (event_private->event == NULL) { /** @todo type error? */ jsret = JS_FALSE; } else { - exc = dom_event_get_type(domevent, &type_dom); - if (dom_string_isequal(type_dom, corestring_dom_load)) { - JS_GetProperty(cx, JSAPI_THIS_OBJECT(cx, vp), "onload", &eventval); - } + exc = dom_event_get_type(event_private->event, &type_dom); + if (exc == DOM_NO_ERR) { + + if (dom_string_isequal(type_dom, corestring_dom_load)) { + JS_GetProperty(cx, JSAPI_THIS_OBJECT(cx, vp), "onload", &eventval); + } - if (eventval != JSVAL_VOID) { - event_argv[0] = event; - jsret = JS_CallFunctionValue(cx, NULL, eventval, 1, event_argv, &event_rval); + if (eventval != JSVAL_VOID) { + event_argv[0] = eventval; + jsret = JS_CallFunctionValue(cx, NULL, eventval, 1, event_argv, &event_rval); + } } } } -- cgit v1.2.3