Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-10 03:29:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Initial check that the script url has a supported extension, currently JS only"

Browse source 
This reverts commit d50bdd6aa9.
This commit is contained in:
Liv 2017-05-22 17:47:16 -07:00
parent 0e6f3e27d3
commit 1fa3e6bda2
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,6 @@
#include "ScriptEngines.h" #include "ScriptEngines.h"
#include <QtCore/QStandardPaths> #include <QtCore/QStandardPaths>
#include <QtCore/QFileInfo>
#include <QtWidgets/QApplication> #include <QtWidgets/QApplication>
@ -450,7 +449,6 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
return result; return result;
} }
QUrl scriptUrl; QUrl scriptUrl;
if (!scriptFilename.isValid() || if (!scriptFilename.isValid() ||
(scriptFilename.scheme() != "http" && (scriptFilename.scheme() != "http" &&
scriptFilename.scheme() != "https" && scriptFilename.scheme() != "https" &&
@ -474,11 +472,8 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
scriptEngine->deleteLater(); scriptEngine->deleteLater();
}, Qt::QueuedConnection); }, Qt::QueuedConnection);
// Check that the script is actually a script
QFileInfo fileInfo(scriptFilename.toString());
bool hasValidScriptSuffix = (fileInfo.completeSuffix() == "js");
if (scriptFilename.isEmpty() || !scriptUrl.isValid() || !hasValidScriptSuffix) { if (scriptFilename.isEmpty() || !scriptUrl.isValid()) {
launchScriptEngine(scriptEngine); launchScriptEngine(scriptEngine);
} else { } else {
// connect to the appropriate signals of this script engine // connect to the appropriate signals of this script engine