fix global handling

2 files changed, 14 insertions, 2 deletions

diff --git a/javascript/jsapi/document.c b/javascript/jsapi/document.c
index dfad551d6..bb5019c4b 100644
--- a/javascript/jsapi/document.c
+++ b/javascript/jsapi/document.c
@@ -92,8 +92,10 @@ JSObject *jsapi_new_document(JSContext *cx, JSObject *parent, void *doc_priv)
 
 	LOG(("setting content to %p",doc_priv));
 	/* private pointer to browsing context */
-	if (!JS_SetPrivate(cx, doc, doc_priv))
+	if (JS_SetPrivate(cx, doc, doc_priv) != JS_TRUE) {
+		LOG(("failed to set content"));
 		return NULL;
+	}
 	
 	return doc;
 }
diff --git a/javascript/jsapi/window.c b/javascript/jsapi/window.c
index 06e6cdfe8..0b7673be3 100644
--- a/javascript/jsapi/window.c
+++ b/javascript/jsapi/window.c
@@ -299,8 +299,18 @@ JSObject * jsapi_new_window(JSContext *cx, JSObject *parent, void *win_priv)
 			return NULL;
 		}
 
+		/** @todo reconsider global object handling. future
+		 * editions of spidermonkey appear to be removing the
+		 * idea of a global so we probably need to handle
+		 * global object references internally
+		 */
+
+		/* set the contexts global */
+		JS_SetGlobalObject(cx, window);
+
 		/* Populate the global object with the standard globals, like
-		   Object and Array. */
+		 *  Object and Array.
+		 */
 		if (!JS_InitStandardClasses(cx, window)) {
 			return NULL;
 		}