From 69fc69cffbd56c48a032297067a3c1e4c5245233 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 8 Aug 2017 15:52:59 -0700 Subject: [PATCH] Comment fix and overlay click fix --- interface/src/ui/overlays/ContextOverlayInterface.cpp | 4 ++-- scripts/system/marketplaces/marketplaces.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp index 50778d26e8..37dfe0d3aa 100644 --- a/interface/src/ui/overlays/ContextOverlayInterface.cpp +++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp @@ -241,7 +241,7 @@ void ContextOverlayInterface::contextOverlays_hoverLeaveEntity(const EntityItemI } static const QString MARKETPLACE_BASE_URL = "https://metaverse.highfidelity.com/marketplace/items/"; -static const QString MARKETPLACES_INJECT_SCRIPT_URL = PathUtils::resourcesPath() + "../scripts/system/html/js/marketplacesInject.js"; +static const QString MARKETPLACES_INJECT_SCRIPT_PATH = PathUtils::resourcesPath() + "../scripts/system/html/js/marketplacesInject.js"; void ContextOverlayInterface::openMarketplace() { // lets open the tablet and go to the current item in @@ -251,7 +251,7 @@ void ContextOverlayInterface::openMarketplace() { auto tablet = dynamic_cast(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); // construct the url to the marketplace item QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID; - tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_URL); + tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH); _hmdScriptingInterface->openTablet(); _isInMarketplaceInspectionMode = true; } diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index 87b920fab1..2713bbf054 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -61,9 +61,9 @@ tablet.webEventReceived.connect(function (message) { var parsedJsonMessage = JSON.parse(message); if (parsedJsonMessage.type === "CHECKOUT") { - console.log("ZRF: Buy Button Clicked: " + JSON.stringify(parsedJsonMessage)); - tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH); + console.log("ZRF: Checkout (Get) Button Clicked: " + JSON.stringify(parsedJsonMessage)); tablet.sendToQml({ method: 'updateCheckoutQML', params: parsedJsonMessage }); + tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH); } if (message === GOTO_DIRECTORY) {