diff --git a/libraries/ui/src/QmlWebWindowClass.cpp b/libraries/ui/src/QmlWebWindowClass.cpp index d799ff2db4..68bb872667 100644 --- a/libraries/ui/src/QmlWebWindowClass.cpp +++ b/libraries/ui/src/QmlWebWindowClass.cpp @@ -50,14 +50,10 @@ void QmlWebWindowClass::setURL(const QString& urlString) { }); } -void QmlWebWindowClass::setScriptUrl(const QString& script) { +void QmlWebWindowClass::setScriptURL(const QString& script) { DependencyManager::get()->executeOnUiThread([=] { if (!_qmlWindow.isNull()) { _qmlWindow->setProperty(SCRIPT_PROPERTY, script); } }); } - -void QmlWebWindowClass::clearScriptUrl(const QString& script) { - setScriptUrl(""); -} diff --git a/libraries/ui/src/QmlWebWindowClass.h b/libraries/ui/src/QmlWebWindowClass.h index 3ed35217ca..15ebe74a4f 100644 --- a/libraries/ui/src/QmlWebWindowClass.h +++ b/libraries/ui/src/QmlWebWindowClass.h @@ -22,8 +22,7 @@ public: public slots: QString getURL() const; void setURL(const QString& url); - void setScriptUrl(const QString& script); - void clearScriptUrl (const QString& script); + void setScriptURL(const QString& script); signals: void urlChanged(); diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index eae23cc65e..a817ff9673 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -15,7 +15,7 @@ Script.include("../libraries/WebTablet.js"); var toolIconUrl = Script.resolvePath("../assets/images/tools/"); -var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html");; +var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html"); var marketplaceWindow = new OverlayWebWindow({ title: "Marketplace", source: "about:blank", @@ -23,14 +23,14 @@ var marketplaceWindow = new OverlayWebWindow({ height: 700, visible: false }); -marketplaceWindow.setScriptUrl(Script.resolvePath("../html/js/marketplacesDirectory.js")); +marketplaceWindow.setScriptURL(Script.resolvePath("../html/js/marketplacesDirectory.js")); marketplaceWindow.webEventReceived.connect(function (data) { if (data === "INJECT_CLARA") { - marketplaceWindow.setScriptUrl(Script.resolvePath("../html/js/marketplacesClara.js")); + marketplaceWindow.setScriptURL(Script.resolvePath("../html/js/marketplacesClara.js")); } if (data === "INJECT_HIFI") { - marketplaceWindow.setScriptUrl(Script.resolvePath("../html/js/marketplacesHiFi.js")); + marketplaceWindow.setScriptURL(Script.resolvePath("../html/js/marketplacesHiFi.js")); } });