diff --git a/libraries/script-engine/src/ScriptManager.cpp b/libraries/script-engine/src/ScriptManager.cpp index 3db51d0c86..b66da2b0db 100644 --- a/libraries/script-engine/src/ScriptManager.cpp +++ b/libraries/script-engine/src/ScriptManager.cpp @@ -683,15 +683,14 @@ void ScriptManager::init() { scriptEngine->registerGlobalObject("Script", this); - //V8TODO: V8 has no such global object? - /*{ + { // set up Script.require.resolve and Script.require.cache auto Script = scriptEngine->globalObject().property("Script"); auto require = Script.property("require"); auto resolve = Script.property("_requireResolve"); require.setProperty("resolve", resolve, READONLY_PROP_FLAGS); resetModuleCache(); - }*/ + } scriptEngine->registerEnum("Script.ExternalPaths", QMetaEnum::fromType()); diff --git a/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp b/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp index ca505278fc..e1bb822a0c 100644 --- a/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp +++ b/libraries/script-engine/src/v8/ScriptEngineV8_cast.cpp @@ -547,7 +547,7 @@ bool ScriptEngineV8::castValueToVariant(const V8ScriptValue& v8Val, QVariant& de bool ScriptEngineV8::convertJSObjectToVariant(v8::Local object, QVariant &dest) { auto context = getContext(); v8::Local names; - if(object->GetPropertyNames(context).ToLocal(&names)) { + if(!object->GetPropertyNames(context).ToLocal(&names)) { qDebug() << "ScriptEngineV8::convertJSObjectToVariant could not get property names"; return false; }