Author: jan
Date: Sat Nov 21 15:33:14 2009
New Revision: 882928
URL: http://svn.apache.org/viewvc?rev=882928&view=rev
Log:
complete backport of COUCHDB-288
Modified:
couchdb/branches/0.9.x/share/www/script/test/show_documents.js
couchdb/branches/0.9.x/src/couchdb/couch_js.c
Modified: couchdb/branches/0.9.x/share/www/script/test/show_documents.js
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/share/www/script/test/show_documents.js?rev=882928&r1=882927&r2=882928&view=diff
==============================================================================
--- couchdb/branches/0.9.x/share/www/script/test/show_documents.js (original)
+++ couchdb/branches/0.9.x/share/www/script/test/show_documents.js Sat Nov 21
15:33:14 2009
@@ -110,7 +110,7 @@
// Becase Safari can't stand to see that dastardly
// E4X outside of a string. Outside of tests you
// can just use E4X literals.
- this.eval('xml.no...@foo = doc.word');
+ eval('xml.no...@foo = doc.word');
return {
body: xml
};
Modified: couchdb/branches/0.9.x/src/couchdb/couch_js.c
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_js.c?rev=882928&r1=882927&r2=882928&view=diff
==============================================================================
--- couchdb/branches/0.9.x/src/couchdb/couch_js.c (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_js.c Sat Nov 21 15:33:14 2009
@@ -229,7 +229,7 @@
*rval = OBJECT_TO_JSVAL(sandbox);
ok = JS_TRUE;
} else {
- ok = JS_EvaluateUCScript(sub_context, sandbox, src, srclen, NULL, -1,
+ ok = JS_EvaluateUCScript(sub_context, sandbox, src, srclen, NULL, 0,
rval);
ok = JS_TRUE;
}
