diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2012-06-19 09:35:51 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2012-06-19 09:35:51 +0000 |
commit | 49effe103a260a60949d3c95494ae81b031799d9 (patch) | |
tree | 5a205757088c1f1d978eea067a7bf186568c582a /javascript | |
parent | a229a35767760c71c94ae66567f7b172c5b8c356 (diff) | |
download | netsurf-49effe103a260a60949d3c95494ae81b031799d9.tar.gz netsurf-49effe103a260a60949d3c95494ae81b031799d9.tar.bz2 |
restructure javascript binding layout to be more explicit
fix html content so it correctly loads all the script tags
svn path=/trunk/netsurf/; revision=13968
Diffstat (limited to 'javascript')
-rw-r--r-- | javascript/jsapi.c (renamed from javascript/js.c) | 6 | ||||
-rw-r--r-- | javascript/jsapi.h (renamed from javascript/global.h) | 8 | ||||
-rw-r--r-- | javascript/jsapi/global.c (renamed from javascript/global.c) | 4 | ||||
-rw-r--r-- | javascript/none.c (renamed from javascript/nojs.c) | 0 |
4 files changed, 9 insertions, 9 deletions
diff --git a/javascript/js.c b/javascript/jsapi.c index 833e01785..6f5b510ef 100644 --- a/javascript/js.c +++ b/javascript/jsapi.c @@ -19,7 +19,7 @@ #include "mozjs/jsapi.h" #include "content/content.h" -#include "javascript/global.h" +#include "javascript/jsapi.h" #include "javascript/js.h" #include "utils/log.h" @@ -50,7 +50,7 @@ void js_finalise(void) /* The error reporter callback. */ static void js_reportError(JSContext *cx, const char *message, JSErrorReport *report) { - LOG(("%s:%u:%s\n", + LOG(("%s:%u:%s", report->filename ? report->filename : "<no filename>", (unsigned int) report->lineno, message)); @@ -131,7 +131,7 @@ jsobject *js_newcompartment(jscontext *ctx, struct content* c) JS_SetContextPrivate(cx, c); /* private pointer to content */ - js_new_globalfunc(cx, global); + jsapi_new_globalfunc(cx, global); /* Populate the global object with the standard globals, like Object and Array. */ diff --git a/javascript/global.h b/javascript/jsapi.h index 329c82c8d..ce2051148 100644 --- a/javascript/global.h +++ b/javascript/jsapi.h @@ -17,12 +17,12 @@ */ /** \file - * spidermonkey engine global functions. + * spidermonkey jsapi bindings. */ -#ifndef _NETSURF_JAVASCRIPT_GLOBAL_H_ -#define _NETSURF_JAVASCRIPT_GLOBAL_H_ +#ifndef _NETSURF_JAVASCRIPT_JSAPI_H_ +#define _NETSURF_JAVASCRIPT_JSAPI_H_ -bool js_new_globalfunc(JSContext *cx, JSObject *global); +bool jsapi_new_globalfunc(JSContext *cx, JSObject *global); #endif diff --git a/javascript/global.c b/javascript/jsapi/global.c index c2033d4fc..b86400428 100644 --- a/javascript/global.c +++ b/javascript/jsapi/global.c @@ -19,7 +19,7 @@ #include "mozjs/jsapi.h" #include "content/content.h" -#include "javascript/global.h" +#include "javascript/jsapi.h" #include "utils/log.h" static JSBool jsalert(JSContext *cx, uintN argc, jsval *vp) @@ -54,7 +54,7 @@ static JSFunctionSpec global_functions[] = JS_FS_END }; -bool js_new_globalfunc(JSContext *cx, JSObject *global) +bool jsapi_new_globalfunc(JSContext *cx, JSObject *global) { return JS_DefineFunctions(cx, global, global_functions); } diff --git a/javascript/nojs.c b/javascript/none.c index ec0ccc0f8..ec0ccc0f8 100644 --- a/javascript/nojs.c +++ b/javascript/none.c |