History

Fix console.log in modules added with Script.require

Karol Suprynowicz committed 8 months ago

Commit c0da1dc1 parent d90df7b4 files · +28 −12Browse files

Showing the changes to libraries/script-engine/src/ScriptManager.cpp (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+15−11
@@ -238,6 +238,20 @@ std::shared_ptr<ScriptException> ScriptManager::getUncaughtException() const { · 237 unmodified lines
238 return _engine->uncaughtException();238 return _engine->uncaughtException();
239}239}
240 240
241void ScriptManager::registerConsoleScriptingInterface(ScriptEngine::ScriptEngineScopeGuard* scopeGuard, ScriptEngine* scriptEngine) {
242 scriptEngine->registerGlobalObject(scopeGuard, "console", _consoleScriptingInterface.get());
243 scriptEngine->registerFunction(scopeGuard, "console", "info", ConsoleScriptingInterface::info, scriptEngine->currentContext()->argumentCount());
244 scriptEngine->registerFunction(scopeGuard, "console", "log", ConsoleScriptingInterface::log, scriptEngine->currentContext()->argumentCount());
245 scriptEngine->registerFunction(scopeGuard, "console", "debug", ConsoleScriptingInterface::debug, scriptEngine->currentContext()->argumentCount());
246 scriptEngine->registerFunction(scopeGuard, "console", "warn", ConsoleScriptingInterface::warn, scriptEngine->currentContext()->argumentCount());
247 scriptEngine->registerFunction(scopeGuard, "console", "error", ConsoleScriptingInterface::error, scriptEngine->currentContext()->argumentCount());
248 scriptEngine->registerFunction(scopeGuard, "console", "exception", ConsoleScriptingInterface::exception, scriptEngine->currentContext()->argumentCount());
249 scriptEngine->registerFunction(scopeGuard, "console", "assert", ConsoleScriptingInterface::assertion, scriptEngine->currentContext()->argumentCount());
250 scriptEngine->registerFunction(scopeGuard, "console", "group", ConsoleScriptingInterface::group, 1);
251 scriptEngine->registerFunction(scopeGuard, "console", "groupCollapsed", ConsoleScriptingInterface::groupCollapsed, 1);
252 scriptEngine->registerFunction(scopeGuard, "console", "groupEnd", ConsoleScriptingInterface::groupEnd, 0);
253}
254
241ScriptManagerPointer scriptManagerFactory(ScriptManager::Context context,255ScriptManagerPointer scriptManagerFactory(ScriptManager::Context context,
242 const QString& scriptContents,256 const QString& scriptContents,
243 const QString& fileNameString) {257 const QString& fileNameString) {
@@ -836,17 +850,7 @@ void ScriptManager::init() { · 592 unmodified lines
836 scriptEngine->registerGlobalObject(sgp, "Messages", DependencyManager::get<MessagesClient>().data());850 scriptEngine->registerGlobalObject(sgp, "Messages", DependencyManager::get<MessagesClient>().data());
837 }851 }
838 852
839 scriptEngine->registerGlobalObject(sgp, "console", _consoleScriptingInterface.get());853 registerConsoleScriptingInterface(sgp, scriptEngine);
840 scriptEngine->registerFunction(sgp, "console", "info", ConsoleScriptingInterface::info, scriptEngine->currentContext()->argumentCount());
841 scriptEngine->registerFunction(sgp, "console", "log", ConsoleScriptingInterface::log, scriptEngine->currentContext()->argumentCount());
842 scriptEngine->registerFunction(sgp, "console", "debug", ConsoleScriptingInterface::debug, scriptEngine->currentContext()->argumentCount());
843 scriptEngine->registerFunction(sgp, "console", "warn", ConsoleScriptingInterface::warn, scriptEngine->currentContext()->argumentCount());
844 scriptEngine->registerFunction(sgp, "console", "error", ConsoleScriptingInterface::error, scriptEngine->currentContext()->argumentCount());
845 scriptEngine->registerFunction(sgp, "console", "exception", ConsoleScriptingInterface::exception, scriptEngine->currentContext()->argumentCount());
846 scriptEngine->registerFunction(sgp, "console", "assert", ConsoleScriptingInterface::assertion, scriptEngine->currentContext()->argumentCount());
847 scriptEngine->registerFunction(sgp, "console", "group", ConsoleScriptingInterface::group, 1);
848 scriptEngine->registerFunction(sgp, "console", "groupCollapsed", ConsoleScriptingInterface::groupCollapsed, 1);
849 scriptEngine->registerFunction(sgp, "console", "groupEnd", ConsoleScriptingInterface::groupEnd, 0);
850 854
851 // constants855 // constants
852 scriptEngine->globalObject().setProperty("TREE_SCALE", scriptEngine->newValue(TREE_SCALE));856 scriptEngine->globalObject().setProperty("TREE_SCALE", scriptEngine->newValue(TREE_SCALE));