From 25e76c668bf05eeb8eea01240c80b86b8d1c9958 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 2 Jan 2018 12:22:40 -0800
Subject: [PATCH 1/2] Fix marketplacesInject.js for local Metaverse

---
 scripts/system/html/js/marketplacesInject.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 2b016884f1..4820c4bf1d 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -30,6 +30,7 @@
     var userIsLoggedIn = false;
     var walletNeedsSetup = false;
     var metaverseServerURL = "https://metaverse.highfidelity.com";
+    var marketplaceBaseURL = "https://highfidelity.com";
 
     function injectCommonCode(isDirectoryPage) {
 
@@ -58,7 +59,7 @@
         );
 
         // Footer.
-        var isInitialHiFiPage = location.href === metaverseServerURL + "/marketplace?";
+        var isInitialHiFiPage = location.href === marketplaceBaseURL + "/marketplace?";
         $("body").append(
             '<div id="marketplace-navigation">' +
                 (!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') +
@@ -70,7 +71,7 @@
 
         // Footer actions.
         $("#back-button").on("click", function () {
-            (document.referrer !== "") ? window.history.back() : window.location = (metaverseServerURL + "/marketplace?");
+            (document.referrer !== "") ? window.history.back() : window.location = (marketplaceBaseURL + "/marketplace?");
         });
         $("#all-markets").on("click", function () {
             EventBridge.emitWebEvent(GOTO_DIRECTORY);
@@ -89,7 +90,7 @@
             window.location = "https://clara.io/library?gameCheck=true&public=true";
         });
         $('#exploreHifiMarketplace').on('click', function () {
-            window.location = "http://www.highfidelity.com/marketplace";
+            window.location = marketplaceBaseURL + "/marketplace";
         });
     }
 
@@ -658,9 +659,9 @@
         var HIFI_ITEM_PAGE = 3;
         var pageType = DIRECTORY;
 
-        if (location.href.indexOf("highfidelity.com/") !== -1) { pageType = HIFI; }
+        if (location.href.indexOf(marketplaceBaseURL + "/") !== -1) { pageType = HIFI; }
         if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; }
-        if (location.href.indexOf("highfidelity.com/marketplace/items/") !== -1) { pageType = HIFI_ITEM_PAGE; }
+        if (location.href.indexOf(marketplaceBaseURL + "/marketplace/items/") !== -1) { pageType = HIFI_ITEM_PAGE; }
 
         injectCommonCode(pageType === DIRECTORY);
         switch (pageType) {
@@ -695,6 +696,11 @@
                         userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn;
                         walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup;
                         metaverseServerURL = parsedJsonMessage.data.metaverseServerURL;
+                        if (metaverseServerURL.indexOf('metaverse.') !== -1) {
+                            marketplaceBaseURL = metaverseServerURL.replace('metaverse.', '');
+                        } else {
+                            marketplaceBaseURL = metaverseServerURL;
+                        }
                         injectCode();
                     }
                 }

From 47a209dc4c5e4829641902dd2d09a2ac94746fa4 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Tue, 2 Jan 2018 13:11:00 -0800
Subject: [PATCH 2/2] Make things slightly better?

---
 interface/resources/qml/js/Utils.jsc         | Bin 0 -> 6596 bytes
 scripts/system/html/js/marketplacesInject.js |   9 +++------
 2 files changed, 3 insertions(+), 6 deletions(-)
 create mode 100644 interface/resources/qml/js/Utils.jsc

diff --git a/interface/resources/qml/js/Utils.jsc b/interface/resources/qml/js/Utils.jsc
new file mode 100644
index 0000000000000000000000000000000000000000..ab20e996b9469915ac6a89901da175143e6b5024
GIT binary patch
literal 6596
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
IW4T=ZA1knw6aWAK

literal 0
HcmV?d00001

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 4820c4bf1d..fb49de1050 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -29,7 +29,6 @@
     var commerceMode = false;
     var userIsLoggedIn = false;
     var walletNeedsSetup = false;
-    var metaverseServerURL = "https://metaverse.highfidelity.com";
     var marketplaceBaseURL = "https://highfidelity.com";
 
     function injectCommonCode(isDirectoryPage) {
@@ -695,11 +694,9 @@
                         commerceMode = !!parsedJsonMessage.data.commerceMode;
                         userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn;
                         walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup;
-                        metaverseServerURL = parsedJsonMessage.data.metaverseServerURL;
-                        if (metaverseServerURL.indexOf('metaverse.') !== -1) {
-                            marketplaceBaseURL = metaverseServerURL.replace('metaverse.', '');
-                        } else {
-                            marketplaceBaseURL = metaverseServerURL;
+                        marketplaceBaseURL = parsedJsonMessage.data.metaverseServerURL;
+                        if (marketplaceBaseURL.indexOf('metaverse.') !== -1) {
+                            marketplaceBaseURL = marketplaceBaseURL.replace('metaverse.', '');
                         }
                         injectCode();
                     }