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

fix inspection case

Browse source
This commit is contained in:
Howard Stearns 2018-09-28 11:57:36 -07:00
parent 2d29906e3c
commit 053f22182a
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -101,11 +101,19 @@ function setupWallet(referrer) {
} }
function onMarketplaceOpen(referrer) { function onMarketplaceOpen(referrer) {
var cta = referrer, match;
if (Account.loggedIn && walletNeedsSetup()) { if (Account.loggedIn && walletNeedsSetup()) {
if (referrer) { if (referrer === MARKETPLACE_URL_INITIAL) {
setupWallet(referrer); setupWallet('marketplace cta');
} else { } else {
print("WARNING: opening marketplace to", url, "without wallet setup."); match = referrer.match(/\/item\/(\w+)$/);
if (match && match[1]) {
setupWallet(match[1]);
} else if (referrer.indexOf(METAVERSE_SERVER_URL) === -1) { // not a url
setupWallet(referrer);
} else {
print("WARNING: opening marketplace to", referrer, "without wallet setup.");
}
} }
} }
} }
@ -117,17 +125,9 @@ function openMarketplace(optionalItemOrUrl) {
// Otherwise, use home and 'marketplace cta'. // Otherwise, use home and 'marketplace cta'.
// AND... if call onMarketplaceOpen to setupWallet if we need to. // AND... if call onMarketplaceOpen to setupWallet if we need to.
var url = optionalItemOrUrl || MARKETPLACE_URL_INITIAL; var url = optionalItemOrUrl || MARKETPLACE_URL_INITIAL;
var cta = 'marketplace cta';
var match;
// If optionalItemOrUrl contains the metaverse base, then it's a url, not an item id. // If optionalItemOrUrl contains the metaverse base, then it's a url, not an item id.
if (optionalItemOrUrl && optionalItemOrUrl.indexOf(METAVERSE_SERVER_URL) === -1) { if (optionalItemOrUrl && optionalItemOrUrl.indexOf(METAVERSE_SERVER_URL) === -1) {
cta = optionalItemOrUrl; // item id
url = MARKETPLACE_URL + '/items/' + optionalItemOrUrl; url = MARKETPLACE_URL + '/items/' + optionalItemOrUrl;
} else if (optionalItemOrUrl) {
// A specific url.
match = optionalItemOrUrl.match(/\/item\/(\w+)$/);
// Don't attempt to set up wallet for a non-item url because we don't have a way to come back.
cta = (match && match[1]) || '';
} }
ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL); ui.open(url, MARKETPLACES_INJECT_SCRIPT_URL);
} }