Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 00:48:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleaned out extra commented code.

Browse source
This commit is contained in:
Kasen IO 2019-12-08 21:12:20 -05:00
parent bc17febb3f
commit f49e64b99f
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml
View file

@ -24,8 +24,6 @@ Rectangle {
function getWhitelistAsText() { function getWhitelistAsText() {
var whitelist = Settings.getValue("private/settingsSafeURLS"); var whitelist = Settings.getValue("private/settingsSafeURLS");
// var arrayWhitelist = whitelist.split(/\s*,\s*/);
// var whitelistText = arrayWhitelist.join("\n");
return whitelist; return whitelist;
} }
@ -86,10 +84,8 @@ Rectangle {
Button { Button {
id: saveChanges id: saveChanges
// anchors.top: whitelistTextArea.bottom;
anchors.topMargin: 5; anchors.topMargin: 5;
anchors.leftMargin: 20; anchors.leftMargin: 20;
// anchors.right: whitelistTextArea.right;
anchors.rightMargin: 20; anchors.rightMargin: 20;
x: textAreaRectangle.x + textAreaRectangle.width - width - 5; x: textAreaRectangle.x + textAreaRectangle.width - width - 5;
y: textAreaRectangle.y + textAreaRectangle.height - height; y: textAreaRectangle.y + textAreaRectangle.height - height;

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

@ -2370,21 +2370,9 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
// PULL SAFEURLS FROM INTERFACE.JSON Settings // PULL SAFEURLS FROM INTERFACE.JSON Settings
QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get(); QVariant raw = Setting::Handle<QVariant>("private/settingsSafeURLS").get();
// qDebug() << "raw value" << raw;
// qDebug() << "raw value as list" << raw.toList();
QStringList settingsSafeURLS = raw.toString().split(QRegExp("[\r\n]+")); QStringList settingsSafeURLS = raw.toString().split(QRegExp("[\r\n]+"));
safeURLS += settingsSafeURLS; safeURLS += settingsSafeURLS;
// QVariantList settingsSafeURLS = Setting::Handle<QVariantList>("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 // END PULL SAFEURLS FROM INTERFACE.JSON Settings
bool isInWhitelist = false; // assume unsafe bool isInWhitelist = false; // assume unsafe