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

works, using additional handler from wallet.js

Browse source
This commit is contained in:
Howard Stearns 2018-09-27 15:34:16 -07:00
parent da5f77afcd
commit 4cf5b51124
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -93,10 +93,10 @@ function setupWallet(cta) {
openWallet(); openWallet();
var ALLOWANCE_FOR_EVENT_BRIDGE_SETUP = 0; var ALLOWANCE_FOR_EVENT_BRIDGE_SETUP = 0;
Script.setTimeout(function () { Script.setTimeout(function () {
ui.tablet.sendToQml({ ui.tablet.sendToQml({
method: 'updateWalletReferrer', method: 'updateWalletReferrer',
referrer: cta referrer: cta
}); });
}, ALLOWANCE_FOR_EVENT_BRIDGE_SETUP); }, ALLOWANCE_FOR_EVENT_BRIDGE_SETUP);
} }
@ -126,7 +126,6 @@ function openMarketplace(optionalItemOrUrl) {
// Does that ever happen without the wallet already setup? // Does that ever happen without the wallet already setup?
cta = ''; cta = '';
} }
onMarketplaceOpen(cta);
ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL); ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL);
} }
@ -714,7 +713,7 @@ function onWebEventReceived(message) {
} else if (message.type === "LOGIN") { } else if (message.type === "LOGIN") {
openLoginWindow(); openLoginWindow();
} else if (message.type === "WALLET_SETUP") { } else if (message.type === "WALLET_SETUP") {
setupWallet('marketplace cta'); setupWallet('marketplace cta');
} else if (message.type === "MY_ITEMS") { } else if (message.type === "MY_ITEMS") {
referrerURL = MARKETPLACE_URL_INITIAL; referrerURL = MARKETPLACE_URL_INITIAL;
filterText = ""; filterText = "";
@ -1017,6 +1016,9 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
SEND_ASSET_PARTICLE_TIMER_UPDATE); SEND_ASSET_PARTICLE_TIMER_UPDATE);
} }
break; break;
case 'goToMarketplaceMainPage':
openMarketplace();
break;
case 'http.request': case 'http.request':
// Handled elsewhere, don't log. // Handled elsewhere, don't log.
break; break;
@ -1112,7 +1114,9 @@ var onTabletScreenChanged = function onTabletScreenChanged(type, url) {
isWired = true; isWired = true;
Wallet.refreshWalletStatus(); Wallet.refreshWalletStatus();
} else { } else {
onMarketplaceOpen('marketplace cta'); if (onMarketplaceScreen) {
onMarketplaceOpen('marketplace cta');
}
ui.tablet.sendToQml({ ui.tablet.sendToQml({
method: 'inspectionCertificate_resetCert' method: 'inspectionCertificate_resetCert'
}); });