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

Fix parsing of embedded entity scripts

Browse source 
Now correctly identifies when scripts are not urls as well as
javascript: urls.
This commit is contained in:
Zander Otavka 2016-08-03 13:48:27 -07:00
parent 9962d47173
commit f9b6db12e3
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/script-engine/src/ScriptCache.cpp
View file

@ -110,11 +110,18 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable
QUrl url = ResourceManager::normalizeURL(unnormalizedURL); QUrl url = ResourceManager::normalizeURL(unnormalizedURL);
// attempt to determine if this is a URL to a script, or if this is actually a script itself (which is valid in the entityScript use case) // attempt to determine if this is a URL to a script, or if this is actually a script itself (which is valid in the entityScript use case)
if (url.scheme().isEmpty() && scriptOrURL.simplified().replace(" ", "").contains("(function(){")) { if (unnormalizedURL.scheme().isEmpty() && scriptOrURL.simplified().replace(" ", "").contains("(function(){")) {
contentAvailable(scriptOrURL, scriptOrURL, false, true); contentAvailable(scriptOrURL, scriptOrURL, false, true);
return; return;
} }
// give a similar treatment to javacript: urls
if (unnormalizedURL.scheme() == "javascript") {
QString contents{ scriptOrURL };
contents.replace(QRegExp("^javascript:"), "");
contentAvailable(scriptOrURL, contents, false, true);
}
Lock lock(_containerLock); Lock lock(_containerLock);
if (_scriptCache.contains(url) && !forceDownload) { if (_scriptCache.contains(url) && !forceDownload) {
auto scriptContent = _scriptCache[url]; auto scriptContent = _scriptCache[url];