Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only show unique resources

Browse source
This commit is contained in:
Zach Fox 2018-10-19 15:43:28 -07:00 committed by Kerry Ivan Kurian
parent d44f9e2ccc
commit de93bbb08b
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/commerce/marketplaceItemTester/ItemUnderTest.qml
View file

@ -314,10 +314,11 @@ Rectangle {
readOnly: true
color: hifi.colors.white
text: {
if (root.detailsExpanded) {
var numUniqueResources = (model.resourceAccessEventText.split("\n").length - 1);
if (root.detailsExpanded && numUniqueResources > 0) {
return model.resourceAccessEventText
} else {
return (model.resourceAccessEventText.split("\n").length - 1).toString() + " resources loaded..."
return numUniqueResources.toString() + " unique resource" + (numUniqueResources === 1 ? "" : "s") + " loaded - expand for details"
}
}
font: Qt.font({ family: "Courier", pointSize: 8, weight: Font.Normal })

24
scripts/system/marketplaces/marketplaces.js
View file

@ -54,14 +54,24 @@ var resourceRequestEvents = [];
function signalResourceRequestEvent(data) {
// Once we can tie resource request events to specific resources,
// we will have to update the "0" in here.
resourceObjectsInTest[0].resourceAccessEventText += "[" + data.date.toISOString() + "] " +
data.url.toString().replace("__NONE__,", "") + "\n";
if (!resourceObjectsInTest[0].resourceUrls) {
resourceObjectsInTest[0].resourceUrls = [];
}
ui.tablet.sendToQml({
method: "resourceRequestEvent",
data: data,
resourceAccessEventText: resourceObjectsInTest[0].resourceAccessEventText
});
var resourceUrl = data.url.toString().replace("__NONE__,", "");
if (resourceObjectsInTest[0].resourceUrls.indexOf(resourceUrl) === -1) {
resourceObjectsInTest[0].resourceUrls.push(resourceUrl);
resourceObjectsInTest[0].resourceAccessEventText += "[" + data.date.toISOString() + "] " +
resourceUrl + "\n";
ui.tablet.sendToQml({
method: "resourceRequestEvent",
data: data,
resourceAccessEventText: resourceObjectsInTest[0].resourceAccessEventText
});
}
}
function onResourceRequestEvent(data) {