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

Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2

Browse source
This commit is contained in:
Zach Fox 2018-10-19 09:50:03 -07:00 committed by Kerry Ivan Kurian
commit 55c1a88404
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ Rectangle {
}
sendToScript({
method: "tester_deleteResourceObject",
objectId: resourceListModel.get(index).id});
objectId: resourceListModel.get(index).resourceObjectId});
resourceListModel.remove(index);
}
}

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

@ -281,15 +281,6 @@ Rectangle {
}
}
function addAllInstalledAppsToList() {
var i, apps = Commerce.getInstalledApps().split(","), len = apps.length;
for(i = 0; i < len - 1; ++i) {
if (i in apps) {
resourceListModel.append(buildResourceObj(apps[i]));
}
}
}
function toUrl(resource) {
var httpPattern = /^http/i;
return httpPattern.test(resource) ? resource : "file:///" + resource;