Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 08:16:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed commented out blocks code

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-08-03 09:42:39 -07:00
parent ebc28a6557
commit c2cb7573c5
2 changed files with 3 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
scripts/system/html/js/marketplacesInject.js
View file

@ -57,7 +57,7 @@
$("body").append( $("body").append(
'<div id="marketplace-navigation">' + '<div id="marketplace-navigation">' +
(!isInitialHiFiPage ? '<input id="back-button" type="button" class="white" value="&lt; Back" />' : '') + (!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 ? '<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>' : '') + (isDirectoryPage ? '<span class="right"><span class="glyph">&#x1f6c8;</span> <span class="text">Select a marketplace to explore.</span><span>' : '') +
'</div>' '</div>'
@ -65,10 +65,7 @@
// Footer actions. // Footer actions.
$("#back-button").on("click", function () { $("#back-button").on("click", function () {
if (window.history.state != null) window.history.back(); (window.history.state != null) ? window.history.back() : window.location = "https://metaverse.highfidelity.com/marketplace?";
// to fix back button issue when in directory
//else window.location = "http://www.highfidelity.com/marketplace";
else window.location = "https://metaverse.highfidelity.com/marketplace?";
}); });
$("#all-markets").on("click", function () { $("#all-markets").on("click", function () {
EventBridge.emitWebEvent(GOTO_DIRECTORY); EventBridge.emitWebEvent(GOTO_DIRECTORY);
@ -82,11 +79,6 @@
letUsKnow.replaceWith(letUsKnow.html()); letUsKnow.replaceWith(letUsKnow.html());
// Add button links. // Add button links.
/* Blocks not yet implemented
$('#exploreBlocksMarketplace').on('click', function () {
window.location = "https://vr.google.com/objects";
});*/
$('#exploreClaraMarketplace').on('click', function () { $('#exploreClaraMarketplace').on('click', function () {
window.location = "https://clara.io/library?gameCheck=true&public=true"; window.location = "https://clara.io/library?gameCheck=true&public=true";
}); });
@ -99,18 +91,6 @@
// Nothing to do. // 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() { function updateClaraCode() {
// Have to repeatedly update Clara page because its content can change dynamically without location.href changing. // Have to repeatedly update Clara page because its content can change dynamically without location.href changing.
@ -342,15 +322,12 @@
var DIRECTORY = 0; var DIRECTORY = 0;
var HIFI = 1; var HIFI = 1;
var BLOCKS = 2; var CLARA = 2;
var CLARA = 3;
var pageType = DIRECTORY; var pageType = DIRECTORY;
if (location.href.indexOf("highfidelity.com/") !== -1) { pageType = HIFI; } 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 (location.href.indexOf("clara.io/") !== -1) { pageType = CLARA; }
//if (pageType != BLOCKS)
injectCommonCode(pageType === DIRECTORY); injectCommonCode(pageType === DIRECTORY);
switch (pageType) { switch (pageType) {
case DIRECTORY: case DIRECTORY:
@ -359,11 +336,6 @@
case HIFI: case HIFI:
injectHiFiCode(); injectHiFiCode();
break; break;
case BLOCKS:
console.log("in Blocks");
//injectBlocksCode();
console.log("blocks injection");
break;
case CLARA: case CLARA:
injectClaraCode(); injectClaraCode();
break; break;

14
scripts/system/html/marketplaces.html
View file

@ -31,20 +31,6 @@
</div> </div>
<hr class="tile-divider"> <hr class="tile-divider">
</div> </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">
<div class="marketplace-tile-first-column"> <div class="marketplace-tile-first-column">
<img class="marketplace-tile-image" src="img/clara-tile.png"> <img class="marketplace-tile-image" src="img/clara-tile.png">