From c2cb7573c5678e3c7d21100a922c7515a6183bbc Mon Sep 17 00:00:00 2001
From: Elisa Lupin-Jimenez <elisa.lj11@gmail.com>
Date: Thu, 3 Aug 2017 09:42:39 -0700
Subject: [PATCH] Removed commented out blocks code

---
 scripts/system/html/js/marketplacesInject.js | 34 ++------------------
 scripts/system/html/marketplaces.html        | 14 --------
 2 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js
index 92fa869242..8a8cf62008 100644
--- a/scripts/system/html/js/marketplacesInject.js
+++ b/scripts/system/html/js/marketplacesInject.js
@@ -57,7 +57,7 @@
         $("body").append(
             '<div id="marketplace-navigation">' +
                 (!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') +
-                (isInitialHiFiPage ? '<span class="glyph">&#x1f6c8;</span> <span class="text">Get items from Blocks and Clara.io!</span>' : '') +
+                (isInitialHiFiPage ? '<span class="glyph">&#x1f6c8;</span> <span class="text">Get items from Clara.io!</span>' : '') +
                 (!isDirectoryPage ? '<input id="all-markets" type="button" class="white" value="See All Markets" />' : '') +
                 (isDirectoryPage ? '<span class="right"><span class="glyph">&#x1f6c8;</span> <span class="text">Select a marketplace to explore.</span><span>' : '') +
             '</div>'
@@ -65,10 +65,7 @@
 
         // Footer actions.
         $("#back-button").on("click", function () {
-            if (window.history.state != null) window.history.back();
-                // to fix back button issue when in directory
-                //else window.location = "http://www.highfidelity.com/marketplace";
-            else window.location = "https://metaverse.highfidelity.com/marketplace?";
+            (window.history.state != null) ? window.history.back() : window.location = "https://metaverse.highfidelity.com/marketplace?";
         });
         $("#all-markets").on("click", function () {
             EventBridge.emitWebEvent(GOTO_DIRECTORY);
@@ -82,11 +79,6 @@
         letUsKnow.replaceWith(letUsKnow.html());
 
         // Add button links.
-
-        /* Blocks not yet implemented 
-        $('#exploreBlocksMarketplace').on('click', function () {
-            window.location = "https://vr.google.com/objects";
-        });*/
         $('#exploreClaraMarketplace').on('click', function () {
             window.location = "https://clara.io/library?gameCheck=true&public=true";
         });
@@ -99,18 +91,6 @@
         // Nothing to do.
     }
 
-    function injectBlocksCode() {
-        // Make space for marketplaces footer in Blocks pages.
-        /*$("body").append(
-            '<div id="marketplace-navigation">' +
-                '<input id="all-markets" type="button" class="white" value="See All Markets" />' +
-            '</div>'
-        );*/
-        $("body").append(
-            '<p>hello</p>'
-        );
-    }
-
     function updateClaraCode() {
         // Have to repeatedly update Clara page because its content can change dynamically without location.href changing.
 
@@ -342,15 +322,12 @@
 
         var DIRECTORY = 0;
         var HIFI = 1;
-        var BLOCKS = 2;
-        var CLARA = 3;
+        var CLARA = 2;
         var pageType = DIRECTORY;
 
         if (location.href.indexOf("highfidelity.com/") !== -1) { pageType = HIFI; }
-        if (location.href.indexOf("google.com/") !== -1) { pageType = BLOCKS; }
         if (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; }
 
-        //if (pageType != BLOCKS) 
         injectCommonCode(pageType === DIRECTORY);
         switch (pageType) {
             case DIRECTORY:
@@ -359,11 +336,6 @@
             case HIFI:
                 injectHiFiCode();
                 break;
-            case BLOCKS:
-                console.log("in Blocks");
-                //injectBlocksCode();
-                console.log("blocks injection");
-                break;
             case CLARA:
                 injectClaraCode();
                 break;
diff --git a/scripts/system/html/marketplaces.html b/scripts/system/html/marketplaces.html
index 11c9e208ca..9e001c064f 100644
--- a/scripts/system/html/marketplaces.html
+++ b/scripts/system/html/marketplaces.html
@@ -31,20 +31,6 @@
                 </div>
                 <hr class="tile-divider">
             </div>
-            <!-- Blocks not yet implemented
-            <div class="marketplace-tile">
-                <div class="marketplace-tile-first-column">
-                    <img class="marketplace-tile-image" src="img/blocks-tile.png">
-                </div>
-                <div class="marketplace-tile-second-column">
-                    <p class="marketplace-tile-description">Blocks, released by Google, allows anyone to create 3D models using just a few simple tools. Browse through other users' creations for low-poly assets to add to your world.</p>
-                </div>
-                <div class="exploreButton-holder">
-                    <input class="blue exploreButton" type="button" value="Explore" id="exploreBlocksMarketplace" />
-                </div>
-                <hr class="tile-divider">
-            </div>
-            -->
             <div class="marketplace-tile">
                 <div class="marketplace-tile-first-column">
                     <img class="marketplace-tile-image" src="img/clara-tile.png">