corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge TM -> JM

Browse Source
This commit is contained in:
Brian Hackett
2011-04-08 19:27:14 -07:00
parent b1f0885ef7 fae1738c24
commit eac99c4620
925 changed files with 17255 additions and 14396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsarray.cpp
View File

@@ -1314,16 +1314,14 @@ array_toString_sub(JSContext *cx, JSObject *obj, JSBool locale,
}
/* Get element's character string. */
if (!(hole || rval->isNullOrUndefined())) {
if (!hole && !rval->isNullOrUndefined()) {
if (locale) {
/* Work on obj.toLocalString() instead. */
JSObject *robj;
if (!js_ValueToObjectOrNull(cx, *rval, &robj))
JSObject *robj = ToObject(cx, rval);
if (!robj)
goto out;
rval->setObjectOrNull(robj);
JSAtom *atom = cx->runtime->atomState.toLocaleStringAtom;
if (!js_TryMethod(cx, robj, atom, 0, NULL, rval))
jsid id = ATOM_TO_JSID(cx->runtime->atomState.toLocaleStringAtom);
if (!robj->callMethod(cx, id, 0, NULL, rval))
goto out;
}