From 1fa3e6bda2d392ce62f6db3bce2258c9cd84587f Mon Sep 17 00:00:00 2001 From: Liv Date: Mon, 22 May 2017 17:47:16 -0700 Subject: [PATCH] Revert "Initial check that the script url has a supported extension, currently JS only" This reverts commit d50bdd6aa9c8557b92609497ff50dac5231dbcf1. --- libraries/script-engine/src/ScriptEngines.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 2e30e614c2..2076657288 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -9,7 +9,6 @@ #include "ScriptEngines.h" #include -#include #include @@ -450,7 +449,6 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL return result; } QUrl scriptUrl; - if (!scriptFilename.isValid() || (scriptFilename.scheme() != "http" && scriptFilename.scheme() != "https" && @@ -474,11 +472,8 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL scriptEngine->deleteLater(); }, 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); } else { // connect to the appropriate signals of this script engine