mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 21:12:53 +02:00
Merge branch 'log-resource-requests-2' of github.com:kkurian/hifi into log-resource-requests-2
This commit is contained in:
commit
55c1a88404
2 changed files with 3 additions and 12 deletions
|
@ -52,7 +52,7 @@ Rectangle {
|
|||
}
|
||||
sendToScript({
|
||||
method: "tester_deleteResourceObject",
|
||||
objectId: resourceListModel.get(index).id});
|
||||
objectId: resourceListModel.get(index).resourceObjectId});
|
||||
resourceListModel.remove(index);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue