Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Comment fix and overlay click fix

Browse source
This commit is contained in:
Zach Fox 2017-08-08 15:52:59 -07:00
parent 7d26d2d88b
commit 69fc69cffb
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/ui/overlays/ContextOverlayInterface.cpp
View file

@ -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 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() { void ContextOverlayInterface::openMarketplace() {
// lets open the tablet and go to the current item in // lets open the tablet and go to the current item in
@ -251,7 +251,7 @@ void ContextOverlayInterface::openMarketplace() {
auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); auto tablet = dynamic_cast<TabletProxy*>(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
// construct the url to the marketplace item // construct the url to the marketplace item
QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID; QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID;
tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_URL); tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH);
_hmdScriptingInterface->openTablet(); _hmdScriptingInterface->openTablet();
_isInMarketplaceInspectionMode = true; _isInMarketplaceInspectionMode = true;
} }

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

@ -61,9 +61,9 @@
tablet.webEventReceived.connect(function (message) { tablet.webEventReceived.connect(function (message) {
var parsedJsonMessage = JSON.parse(message); var parsedJsonMessage = JSON.parse(message);
if (parsedJsonMessage.type === "CHECKOUT") { if (parsedJsonMessage.type === "CHECKOUT") {
console.log("ZRF: Buy Button Clicked: " + JSON.stringify(parsedJsonMessage)); console.log("ZRF: Checkout (Get) Button Clicked: " + JSON.stringify(parsedJsonMessage));
tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH);
tablet.sendToQml({ method: 'updateCheckoutQML', params: parsedJsonMessage }); tablet.sendToQml({ method: 'updateCheckoutQML', params: parsedJsonMessage });
tablet.pushOntoStack(MARKETPLACE_CHECKOUT_QML_PATH);
} }
if (message === GOTO_DIRECTORY) { if (message === GOTO_DIRECTORY) {