From f49e64b99f8829221caa83cfe7324b87d7487e6f Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Sun, 8 Dec 2019 21:12:20 -0500 Subject: [PATCH] Cleaned out extra commented code. --- .../hifi/dialogs/security/EntityScriptWhitelist.qml | 4 ---- libraries/script-engine/src/ScriptEngine.cpp | 12 ------------ 2 files changed, 16 deletions(-) diff --git a/interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml b/interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml index 45a8368ce4..ba3f27788d 100644 --- a/interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml +++ b/interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml @@ -24,8 +24,6 @@ Rectangle { function getWhitelistAsText() { var whitelist = Settings.getValue("private/settingsSafeURLS"); - // var arrayWhitelist = whitelist.split(/\s*,\s*/); - // var whitelistText = arrayWhitelist.join("\n"); return whitelist; } @@ -86,10 +84,8 @@ Rectangle { Button { id: saveChanges - // anchors.top: whitelistTextArea.bottom; anchors.topMargin: 5; anchors.leftMargin: 20; - // anchors.right: whitelistTextArea.right; anchors.rightMargin: 20; x: textAreaRectangle.x + textAreaRectangle.width - width - 5; y: textAreaRectangle.y + textAreaRectangle.height - height; diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 78b483e3b3..d8d593df32 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -2370,21 +2370,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co // PULL SAFEURLS FROM INTERFACE.JSON Settings QVariant raw = Setting::Handle("private/settingsSafeURLS").get(); - // qDebug() << "raw value" << raw; - // qDebug() << "raw value as list" << raw.toList(); QStringList settingsSafeURLS = raw.toString().split(QRegExp("[\r\n]+")); safeURLS += settingsSafeURLS; - // QVariantList settingsSafeURLS = Setting::Handle("private/settingsSafeURLS").get(); - // qCDebug(scriptengine) << "ESWsafeURLS" << safeURLS; - - // for (QVariantList::iterator surl = settingsSafeURLS.begin(); surl != settingsSafeURLS.end(); surl++) - // { - // safeURLS += (*surl).toString(); - // } - - // for (const auto& s : settingsSafeURLS) safeURLS << s.toString(); - // END PULL SAFEURLS FROM INTERFACE.JSON Settings bool isInWhitelist = false; // assume unsafe