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

Code review

Browse source
This commit is contained in:
David Rowe 2018-06-21 16:35:37 +12:00
parent 064f4ca204
commit d43be5ce19
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
scripts/system/html/js/entityList.js
View file

@ -184,27 +184,25 @@ function loaded() {
currentElement.onclick = onRowClicked; currentElement.onclick = onRowClicked;
currentElement.ondblclick = onRowDoubleClicked; currentElement.ondblclick = onRowDoubleClicked;
}); });
if (refreshEntityListTimer) {
clearTimeout(refreshEntityListTimer);
}
refreshEntityListTimer = setTimeout(refreshEntityListObject, 50);
} else { } else {
var item = entities[id].item; var item = entities[id].item;
item.values({ name: name, url: filename, locked: locked, visible: visible }); item.values({ name: name, url: filename, locked: locked, visible: visible });
} }
} }
function removeEntities(deletedIDs, selectedIDs) { function removeEntities(deletedIDs) {
for (i = 0, length = deletedIDs.length; i < length; i++) { for (i = 0, length = deletedIDs.length; i < length; i++) {
delete entities[deletedIDs[i]]; delete entities[deletedIDs[i]];
entityList.remove("id", deletedIDs[i]); entityList.remove("id", deletedIDs[i]);
} }
}
function scheduleRefreshEntityList() {
var REFRESH_DELAY = 50;
if (refreshEntityListTimer) { if (refreshEntityListTimer) {
clearTimeout(refreshEntityListTimer); clearTimeout(refreshEntityListTimer);
} }
refreshEntityListTimer = setTimeout(refreshEntityListObject, 50); refreshEntityListTimer = setTimeout(refreshEntityListObject, REFRESH_DELAY);
updateSelectedEntities(selectedIDs);
} }
function clearEntities() { function clearEntities() {
@ -377,15 +375,15 @@ function loaded() {
newEntities[i].hasScript ? SCRIPT_GLYPH : null); newEntities[i].hasScript ? SCRIPT_GLYPH : null);
} }
updateSelectedEntities(data.selectedIDs); updateSelectedEntities(data.selectedIDs);
scheduleRefreshEntityList();
resize(); resize();
} }
} else if (data.type === "removeEntities" && data.deletedIDs !== undefined) { } else if (data.type === "removeEntities" && data.deletedIDs !== undefined && data.selectedIDs !== undefined) {
removeEntities(data.deletedIDs, data.selectedIDs); removeEntities(data.deletedIDs);
} else if (data.type === "deleted") { updateSelectedEntities(data.selectedIDs);
for (i = 0, length = data.ids.length; i < length; i++) { scheduleRefreshEntityList();
delete entities[data.ids[i]]; } else if (data.type === "deleted" && data.ids) {
entityList.remove("id", data.ids[i]); removeEntities(data.ids);
}
refreshFooter(); refreshFooter();
} }
}); });

2
scripts/system/html/js/entityProperties.js
View file

@ -911,7 +911,7 @@ function loaded() {
elID.value = ""; elID.value = "";
elPropertiesList.className = ''; elPropertiesList.className = '';
disableProperties(); disableProperties();
} else if (data.selections && data.selections.length > 1) { } else if (data.selections.length > 1) {
deleteJSONEditor(); deleteJSONEditor();
deleteJSONMaterialEditor(); deleteJSONMaterialEditor();
var selections = data.selections; var selections = data.selections;