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

Cleanup FIXME

Browse source
This commit is contained in:
Zach Fox 2018-10-31 13:53:18 -07:00
parent a1276ba899
commit 34fb849536
2 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -161,7 +161,7 @@ Rectangle {
id: titleBarContainer; id: titleBarContainer;
z: 997; z: 997;
visible: false; visible: false;
height: 100; // HRS FIXME: get rid of the header and associated code entirely? height: 100;
// Size // Size
width: parent.width; width: parent.width;
// Anchors // Anchors

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

@ -251,7 +251,6 @@
} }
cost = $(this).closest('.col-xs-3').find('.item-cost').text(); cost = $(this).closest('.col-xs-3').find('.item-cost').text();
var costInt = parseInt(cost, 10); var costInt = parseInt(cost, 10);
var disable = limitedCommerce && (costInt > 0);
$(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6'); $(this).closest('.col-xs-3').prev().attr("class", 'col-xs-6');
$(this).closest('.col-xs-3').attr("class", 'col-xs-6'); $(this).closest('.col-xs-3').attr("class", 'col-xs-6');
@ -260,23 +259,11 @@
priceElement.css({ priceElement.css({
"padding": "3px 5px", "padding": "3px 5px",
"height": "40px", "height": "40px",
"background": disable ? "grey" : "linear-gradient(#00b4ef, #0093C5)", "background": "linear-gradient(#00b4ef, #0093C5)",
"color": "#FFF", "color": "#FFF",
"font-weight": "600", "font-weight": "600",
"line-height": "34px" "line-height": "34px"
}); });
if (parseInt(cost) > 0) {
if (disable) {
priceElement.html('N/A'); // In case the following fails
$(this).parent().parent().parent().parent().parent().css({"display": "none"}); // HRS FIXME, oh and do I have to set display non-none in the other branch?
} else {
priceElement.css({ "width": "auto" });
priceElement.html('<span class="hifi-glyph hifi-glyph-hfc" style="filter:invert(1);background-size:20px;' +
'width:20px;height:20px;position:relative;top:5px;"></span> ' + cost);
priceElement.css({ "min-width": priceElement.width() + 30 });
}
}
}); });
// change pricing to GET/BUY on button hover // change pricing to GET/BUY on button hover
@ -395,9 +382,6 @@
var cost = $('.item-cost').text(); var cost = $('.item-cost').text();
var costInt = parseInt(cost, 10); var costInt = parseInt(cost, 10);
var availability = $.trim($('.item-availability').text()); var availability = $.trim($('.item-availability').text());
if (limitedCommerce && (costInt > 0)) {
availability = '';
}
if (availability === 'available') { if (availability === 'available') {
purchaseButton.css({ purchaseButton.css({
"background": "linear-gradient(#00b4ef, #0093C5)", "background": "linear-gradient(#00b4ef, #0093C5)",