Merge backout.

This commit is contained in:
Blake Kaplan 2010-10-29 10:48:19 -07:00
commit 6317e3db02

View File

@ -1042,9 +1042,7 @@ proxy_Construct(JSContext *cx, uintN argc, Value *vp)
static JSType
proxy_TypeOf_fun(JSContext *cx, JSObject *obj)
{
return obj->unwrap()->isRegExp()
? JSTYPE_OBJECT
: JSTYPE_FUNCTION;
return JSTYPE_FUNCTION;
}
JS_FRIEND_API(Class) FunctionProxyClass = {