mirror of
https://github.com/JulianGro/overte.git
synced 2025-08-04 09:04:31 +02:00
Re-enabled script module cache creation
This commit is contained in:
parent
58c444542f
commit
2409c9e2d9
2 changed files with 3 additions and 4 deletions
|
@ -683,15 +683,14 @@ void ScriptManager::init() {
|
||||||
|
|
||||||
scriptEngine->registerGlobalObject("Script", this);
|
scriptEngine->registerGlobalObject("Script", this);
|
||||||
|
|
||||||
//V8TODO: V8 has no such global object?
|
{
|
||||||
/*{
|
|
||||||
// set up Script.require.resolve and Script.require.cache
|
// set up Script.require.resolve and Script.require.cache
|
||||||
auto Script = scriptEngine->globalObject().property("Script");
|
auto Script = scriptEngine->globalObject().property("Script");
|
||||||
auto require = Script.property("require");
|
auto require = Script.property("require");
|
||||||
auto resolve = Script.property("_requireResolve");
|
auto resolve = Script.property("_requireResolve");
|
||||||
require.setProperty("resolve", resolve, READONLY_PROP_FLAGS);
|
require.setProperty("resolve", resolve, READONLY_PROP_FLAGS);
|
||||||
resetModuleCache();
|
resetModuleCache();
|
||||||
}*/
|
}
|
||||||
|
|
||||||
scriptEngine->registerEnum("Script.ExternalPaths", QMetaEnum::fromType<ExternalResource::Bucket>());
|
scriptEngine->registerEnum("Script.ExternalPaths", QMetaEnum::fromType<ExternalResource::Bucket>());
|
||||||
|
|
||||||
|
|
|
@ -547,7 +547,7 @@ bool ScriptEngineV8::castValueToVariant(const V8ScriptValue& v8Val, QVariant& de
|
||||||
bool ScriptEngineV8::convertJSObjectToVariant(v8::Local<v8::Object> object, QVariant &dest) {
|
bool ScriptEngineV8::convertJSObjectToVariant(v8::Local<v8::Object> object, QVariant &dest) {
|
||||||
auto context = getContext();
|
auto context = getContext();
|
||||||
v8::Local<v8::Array> names;
|
v8::Local<v8::Array> names;
|
||||||
if(object->GetPropertyNames(context).ToLocal(&names)) {
|
if(!object->GetPropertyNames(context).ToLocal(&names)) {
|
||||||
qDebug() << "ScriptEngineV8::convertJSObjectToVariant could not get property names";
|
qDebug() << "ScriptEngineV8::convertJSObjectToVariant could not get property names";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue