diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-11-28 22:42:45 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-11-28 22:42:45 +0000 |
| commit | ec79063155c809d52e54812e0045900bbad53532 (patch) | |
| tree | 1844f9b804ff1cead8dafde23c95537a610e357e | |
| parent | 168d09c8780de36daa580a2b584059e37744b53b (diff) | |
| parent | d80bb6210dcad46997b190793efa5d472a1809c1 (diff) | |
| download | netsurf-ec79063155c809d52e54812e0045900bbad53532.tar.gz netsurf-ec79063155c809d52e54812e0045900bbad53532.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
| -rw-r--r-- | javascript/jsapi/window.bnd | 2 | ||||
| -rw-r--r-- | render/html.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/javascript/jsapi/window.bnd b/javascript/jsapi/window.bnd index 7ad54dbac..56b2ff090 100644 --- a/javascript/jsapi/window.bnd +++ b/javascript/jsapi/window.bnd @@ -246,7 +246,7 @@ operation dispatchEvent %{ JS_GetProperty(cx, JSAPI_THIS_OBJECT(cx, vp), "onload", &eventval); } - if (JSVAL_IS_VOID(eventval)) { + if (!JSVAL_IS_VOID(eventval)) { event_argv[0] = eventval; jsret = JS_CallFunctionValue(cx, NULL, eventval, 1, event_argv, &event_rval); } diff --git a/render/html.c b/render/html.c index fc6084332..f90d1ee18 100644 --- a/render/html.c +++ b/render/html.c @@ -43,6 +43,7 @@ #include "render/imagemap.h" #include "render/layout.h" #include "render/search.h" +#include "javascript/js.h" #include "utils/corestrings.h" #include "utils/http.h" #include "utils/libdom.h" |