Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

revert f9747d8a (rawURL) + apply alternative approach for aligning batch-loaded script URLs

Browse source
This commit is contained in:
humbletim 2016-11-02 14:58:50 -04:00
parent f9747d8a44
commit d749f243c6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/script-engine/src/BatchLoader.cpp
View file

@ -44,6 +44,7 @@ void BatchLoader::start() {
return; return;
} }
for (const auto& rawURL : _urls) { for (const auto& rawURL : _urls) {
QUrl url = expandScriptUrl(normalizeScriptURL(rawURL)); QUrl url = expandScriptUrl(normalizeScriptURL(rawURL));
@ -56,12 +57,12 @@ void BatchLoader::start() {
// anything. // anything.
ScriptCacheSignalProxy* proxy = new ScriptCacheSignalProxy(scriptCache.data()); ScriptCacheSignalProxy* proxy = new ScriptCacheSignalProxy(scriptCache.data());
connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this, rawURL](const QString& url, const QString& contents, bool isURL, bool success) { connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this](const QString& url, const QString& contents, bool isURL, bool success) {
if (isURL && success) { if (isURL && success) {
_data.insert(rawURL, contents); _data.insert(url, contents);
qCDebug(scriptengine) << "Loaded: " << url; qCDebug(scriptengine) << "Loaded: " << url;
} else { } else {
_data.insert(rawURL, QString()); _data.insert(url, QString());
qCDebug(scriptengine) << "Could not load: " << url; qCDebug(scriptengine) << "Could not load: " << url;
} }

2
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -1187,6 +1187,8 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac
thisURL = resolvePath(file); thisURL = resolvePath(file);
} }
thisURL = expandScriptUrl(normalizeScriptURL(ResourceManager::normalizeURL(thisURL)));
if (!_includedURLs.contains(thisURL)) { if (!_includedURLs.contains(thisURL)) {
if (!isStandardLibrary && !currentSandboxURL.isEmpty() && (thisURL.scheme() == "file") && if (!isStandardLibrary && !currentSandboxURL.isEmpty() && (thisURL.scheme() == "file") &&
(currentSandboxURL.scheme() != "file" || (currentSandboxURL.scheme() != "file" ||