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

Implement delete-from-list functionality in marketplace item tester

Browse source
This commit is contained in:
Kerry Ivan Kurian 2018-09-24 23:07:44 -07:00
parent 505e08b841
commit ca1da9c830
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml
View file

@ -136,6 +136,9 @@ Rectangle {
if ("application" == assetType) { if ("application" == assetType) {
Commerce.uninstallApp(resource); Commerce.uninstallApp(resource);
} }
sendToScript({
method: "tester_deleteResourceObject",
objectId: resourceListModel.get(index).id});
resourceListModel.remove(index); resourceListModel.remove(index);
} }
} }
@ -174,13 +177,14 @@ Rectangle {
"unknown" "unknown"
] ]
currentIndex: ("entity or wearable" == assetType) ? model.indexOf("unknown") : model.indexOf(assetType) currentIndex: (("entity or wearable" == assetType) ?
model.indexOf("unknown") : model.indexOf(assetType))
Component.onCompleted: { Component.onCompleted: {
onCurrentIndexChanged.connect(function() { onCurrentIndexChanged.connect(function() {
assetType = model[currentIndex]; assetType = model[currentIndex];
sendToScript({ sendToScript({
method: 'tester_updateResourceObjectAssetType', method: "tester_updateResourceObjectAssetType",
objectId: resourceListModel.get(index)["id"], objectId: resourceListModel.get(index)["id"],
assetType: assetType }); assetType: assetType });
}); });

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

@ -770,18 +770,13 @@ function maybeEnableHMDPreview() {
}, UI_FADE_TIMEOUT_MS); }, UI_FADE_TIMEOUT_MS);
} }
var resourceObjectsInTest = [];
function signalNewResourceObjectInTest(resourceObject) { function signalNewResourceObjectInTest(resourceObject) {
ui.tablet.sendToQml({ ui.tablet.sendToQml({
method: "newResourceObjectInTest", method: "newResourceObjectInTest",
resourceObject: resourceObject }); resourceObject: resourceObject });
} }
var resourceObjectsInTest = [];
function storeResourceObjectInTest(resourceObject) {
resourceObjectsInTest.push(resourceObject);
signalNewResourceObjectInTest(resourceObject);
}
var onQmlMessageReceived = function onQmlMessageReceived(message) { var onQmlMessageReceived = function onQmlMessageReceived(message) {
if (message.messageSrc === "HTML") { if (message.messageSrc === "HTML") {
return; return;
@ -835,18 +830,15 @@ var onQmlMessageReceived = function onQmlMessageReceived(message) {
rezEntity(message.itemHref, message.itemType); rezEntity(message.itemHref, message.itemType);
break; break;
case 'tester_newResourceObject': case 'tester_newResourceObject':
storeResourceObjectInTest(message.resourceObject); var resourceObject = message.resourceObject;
resourceObjectsInTest[resourceObject.id] = resourceObject;
signalNewResourceObjectInTest(resourceObject);
break; break;
case 'tester_updateResourceObjectAssetType': case 'tester_updateResourceObjectAssetType':
var objectId = message.objectId; resourceObjectsInTest[message.objectId].assetType = message.assetType;
for (var i = 0, size = resourceObjectsInTest.length; i < size; ++i) { break;
if (i in resourceObjectsInTest && case 'tester_deleteResourceObject':
objectId === resourceObjectsInTest[i]["id"] delete resourceObjectsInTest[message.objectId];
) {
resourceObjectsInTest[i]["assetType"] = message.assetType;
break;
}
}
break; break;
case 'header_marketplaceImageClicked': case 'header_marketplaceImageClicked':
case 'purchases_backClicked': case 'purchases_backClicked':