| Index: fxjse/class.cpp
|
| diff --git a/fxjse/class.cpp b/fxjse/class.cpp
|
| index 1dba7f073fd370c9eae7b0298486c3b3fe70b341..a4ed0916bde108be040cddb17f0ad9f187a418ed 100644
|
| --- a/fxjse/class.cpp
|
| +++ b/fxjse/class.cpp
|
| @@ -104,6 +104,9 @@ static void FXJSE_V8SetterCallback_Wrapper(
|
|
|
| static void FXJSE_V8ConstructorCallback_Wrapper(
|
| const v8::FunctionCallbackInfo<v8::Value>& info) {
|
| + if (!info.IsConstructCall()) {
|
| + return;
|
| + }
|
| const FXJSE_CLASS_DESCRIPTOR* lpClassDefinition =
|
| static_cast<FXJSE_CLASS_DESCRIPTOR*>(
|
| info.Data().As<v8::External>()->Value());
|
| @@ -228,13 +231,14 @@ CFXJSE_Class* CFXJSE_Class::Create(
|
| }
|
| if (lpClassDefinition->methNum) {
|
| for (int32_t i = 0; i < lpClassDefinition->methNum; i++) {
|
| + v8::Local<v8::FunctionTemplate> fun = v8::FunctionTemplate::New(
|
| + pIsolate, FXJSE_V8FunctionCallback_Wrapper,
|
| + v8::External::New(pIsolate, const_cast<FXJSE_FUNCTION_DESCRIPTOR*>(
|
| + lpClassDefinition->methods + i)));
|
| + fun->RemovePrototype();
|
| hObjectTemplate->Set(
|
| v8::String::NewFromUtf8(pIsolate, lpClassDefinition->methods[i].name),
|
| - v8::FunctionTemplate::New(
|
| - pIsolate, FXJSE_V8FunctionCallback_Wrapper,
|
| - v8::External::New(pIsolate,
|
| - const_cast<FXJSE_FUNCTION_DESCRIPTOR*>(
|
| - lpClassDefinition->methods + i))),
|
| + fun,
|
| static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete));
|
| }
|
| }
|
| @@ -260,12 +264,12 @@ CFXJSE_Class* CFXJSE_Class::Create(
|
| }
|
| }
|
| if (bIsJSGlobal) {
|
| - hObjectTemplate->Set(
|
| - v8::String::NewFromUtf8(pIsolate, "toString"),
|
| - v8::FunctionTemplate::New(
|
| - pIsolate, FXJSE_Context_GlobalObjToString,
|
| - v8::External::New(pIsolate, const_cast<FXJSE_CLASS_DESCRIPTOR*>(
|
| - lpClassDefinition))));
|
| + v8::Local<v8::FunctionTemplate> fun = v8::FunctionTemplate::New(
|
| + pIsolate, FXJSE_Context_GlobalObjToString,
|
| + v8::External::New(
|
| + pIsolate, const_cast<FXJSE_CLASS_DESCRIPTOR*>(lpClassDefinition)));
|
| + fun->RemovePrototype();
|
| + hObjectTemplate->Set(v8::String::NewFromUtf8(pIsolate, "toString"), fun);
|
| }
|
| pClass->m_hTemplate.Reset(lpContext->m_pIsolate, hFunctionTemplate);
|
| lpContext->m_rgClasses.push_back(std::unique_ptr<CFXJSE_Class>(pClass));
|
|
|