Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 09:24:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix up script injection methods

Browse source
This commit is contained in:
David Rowe 2016-11-15 10:24:38 +13:00
parent e7d9f98ca4
commit 1eeec2a3a1
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/ui/src/QmlWebWindowClass.cpp
View file

@ -50,14 +50,10 @@ void QmlWebWindowClass::setURL(const QString& urlString) {
}); });
} }
void QmlWebWindowClass::setScriptUrl(const QString& script) { void QmlWebWindowClass::setScriptURL(const QString& script) {
DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] { DependencyManager::get<OffscreenUi>()->executeOnUiThread([=] {
if (!_qmlWindow.isNull()) { if (!_qmlWindow.isNull()) {
_qmlWindow->setProperty(SCRIPT_PROPERTY, script); _qmlWindow->setProperty(SCRIPT_PROPERTY, script);
} }
}); });
} }
void QmlWebWindowClass::clearScriptUrl(const QString& script) {
setScriptUrl("");
}

3
libraries/ui/src/QmlWebWindowClass.h
View file

@ -22,8 +22,7 @@ public:
public slots: public slots:
QString getURL() const; QString getURL() const;
void setURL(const QString& url); void setURL(const QString& url);
void setScriptUrl(const QString& script); void setScriptURL(const QString& script);
void clearScriptUrl (const QString& script);
signals: signals:
void urlChanged(); void urlChanged();

8
scripts/system/marketplaces/marketplaces.js
View file

@ -15,7 +15,7 @@ Script.include("../libraries/WebTablet.js");
var toolIconUrl = Script.resolvePath("../assets/images/tools/"); 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({ var marketplaceWindow = new OverlayWebWindow({
title: "Marketplace", title: "Marketplace",
source: "about:blank", source: "about:blank",
@ -23,14 +23,14 @@ var marketplaceWindow = new OverlayWebWindow({
height: 700, height: 700,
visible: false visible: false
}); });
marketplaceWindow.setScriptUrl(Script.resolvePath("../html/js/marketplacesDirectory.js")); marketplaceWindow.setScriptURL(Script.resolvePath("../html/js/marketplacesDirectory.js"));
marketplaceWindow.webEventReceived.connect(function (data) { marketplaceWindow.webEventReceived.connect(function (data) {
if (data === "INJECT_CLARA") { if (data === "INJECT_CLARA") {
marketplaceWindow.setScriptUrl(Script.resolvePath("../html/js/marketplacesClara.js")); marketplaceWindow.setScriptURL(Script.resolvePath("../html/js/marketplacesClara.js"));
} }
if (data === "INJECT_HIFI") { if (data === "INJECT_HIFI") {
marketplaceWindow.setScriptUrl(Script.resolvePath("../html/js/marketplacesHiFi.js")); marketplaceWindow.setScriptURL(Script.resolvePath("../html/js/marketplacesHiFi.js"));
} }
}); });