History

Add the ability to get the context that a script is running in

Ryan Huffman committed 9 years ago

Commit 9b1cd521 parent 6da188b7 files · +47 −10Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+4−3
@@ -62,8 +62,9 @@ void ScriptEngines::onErrorLoadingScript(const QString& url) { · 61 unmodified lines
62 emit errorLoadingScript(url, scriptName);62 emit errorLoadingScript(url, scriptName);
63}63}
64 64
65ScriptEngines::ScriptEngines()65ScriptEngines::ScriptEngines(ScriptEngine::Context context)
66 : _scriptsLocationHandle("scriptsLocation", DESKTOP_LOCATION)66 : _context(context),
67 _scriptsLocationHandle("scriptsLocation", DESKTOP_LOCATION)
67{68{
68 _scriptsModelFilter.setSourceModel(&_scriptsModel);69 _scriptsModelFilter.setSourceModel(&_scriptsModel);
69 _scriptsModelFilter.sort(0, Qt::AscendingOrder);70 _scriptsModelFilter.sort(0, Qt::AscendingOrder);
@@ -453,7 +454,7 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL · 383 unmodified lines
453 return scriptEngine;454 return scriptEngine;
454 }455 }
455 456
456 scriptEngine = new ScriptEngine(NO_SCRIPT, "");457 scriptEngine = new ScriptEngine(_context, NO_SCRIPT, "");
457 scriptEngine->setUserLoaded(isUserLoaded);458 scriptEngine->setUserLoaded(isUserLoaded);
458 connect(scriptEngine, &ScriptEngine::doneRunning, this, [scriptEngine] {459 connect(scriptEngine, &ScriptEngine::doneRunning, this, [scriptEngine] {
459 scriptEngine->deleteLater();460 scriptEngine->deleteLater();