From 58de136dfa899afce7c41214062f7d60e2b8f34b Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Tue, 29 May 2018 22:39:05 +0300 Subject: [PATCH] fix MARKETPLACES_INJECT_SCRIPT_URL, apply it on opening avatar info --- scripts/system/avatarapp.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/system/avatarapp.js b/scripts/system/avatarapp.js index e0f48b64a5..8fece3dfde 100644 --- a/scripts/system/avatarapp.js +++ b/scripts/system/avatarapp.js @@ -157,7 +157,7 @@ var grabbedAvatarEntityChangeNotifier = null; var MARKETPLACE_PURCHASES_QML_PATH = "hifi/commerce/purchases/Purchases.qml"; var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace"; -var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js"); +var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("html/js/marketplacesInject.js"); function fromQml(message) { // messages are {method, params}, like json-rpc. See also sendToQml. console.debug('fromQml: message = ', JSON.stringify(message, null, '\t')) @@ -265,7 +265,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See } else if(message.url.indexOf('hifi://') === 0) { AddressManager.handleLookupString(message.url, false); } else if(message.url.indexOf('https://') === 0 || message.url.indexOf('http://') === 0) { - tablet.gotoWebScreen(message.url); + tablet.gotoWebScreen(message.url, MARKETPLACES_INJECT_SCRIPT_URL); } break;