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 pull request #14043 from huffman/fix/entity-list-sort-visible-lock-74

Browse source 
Fix sorting of entity list not working as expected
This commit is contained in:
John Conklin II 2018-09-21 11:44:17 -07:00 committed by GitHub
commit fa5bb84628
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,8 +27,11 @@ const COMPARE_ASCENDING = function(a, b) {
return -1; return -1;
} else if (va > vb) { } else if (va > vb) {
return 1; return 1;
} else if (a.id < b.id) {
return -1;
} }
return 0;
return 1;
} }
const COMPARE_DESCENDING = function(a, b) { const COMPARE_DESCENDING = function(a, b) {
return COMPARE_ASCENDING(b, a); return COMPARE_ASCENDING(b, a);
@ -223,15 +226,15 @@ function loaded() {
type: type, type: type,
url: filename, url: filename,
fullUrl: entity.url, fullUrl: entity.url,
locked: entity.locked ? LOCKED_GLYPH : null, locked: entity.locked,
visible: entity.visible ? VISIBLE_GLYPH : null, visible: entity.visible,
verticesCount: displayIfNonZero(entity.verticesCount), verticesCount: entity.verticesCount,
texturesCount: displayIfNonZero(entity.texturesCount), texturesCount: entity.texturesCount,
texturesSize: decimalMegabytes(entity.texturesSize), texturesSize: entity.texturesSize,
hasTransparent: entity.hasTransparent ? TRANSPARENCY_GLYPH : null, hasTransparent: entity.hasTransparent,
isBaked: entity.isBaked ? BAKED_GLYPH : null, isBaked: entity.isBaked,
drawCalls: displayIfNonZero(entity.drawCalls), drawCalls: entity.drawCalls,
hasScript: entity.hasScript ? SCRIPT_GLYPH : null, hasScript: entity.hasScript,
} }
entities.push(entityData); entities.push(entityData);
@ -259,15 +262,15 @@ function loaded() {
addColumn('type', entity.type); addColumn('type', entity.type);
addColumn('name', entity.name); addColumn('name', entity.name);
addColumn('url', entity.url); addColumn('url', entity.url);
addColumnHTML('locked glyph', entity.locked); addColumnHTML('locked glyph', entity.locked ? LOCKED_GLYPH : null);
addColumnHTML('visible glyph', entity.visible); addColumnHTML('visible glyph', entity.visible ? VISIBLE_GLYPH : null);
addColumn('verticesCount', entity.verticesCount); addColumn('verticesCount', displayIfNonZero(entity.verticesCount));
addColumn('texturesCount', entity.texturesCount); addColumn('texturesCount', displayIfNonZero(entity.texturesCount));
addColumn('texturesSize', entity.texturesSize); addColumn('texturesSize', decimalMegabytes(entity.texturesSize));
addColumnHTML('hasTransparent glyph', entity.hasTransparent); addColumnHTML('hasTransparent glyph', entity.hasTransparent ? TRANSPARENCY_GLYPH : null);
addColumnHTML('isBaked glyph', entity.isBaked); addColumnHTML('isBaked glyph', entity.isBaked ? BAKED_GLYPH : null);
addColumn('drawCalls', entity.drawCalls); addColumn('drawCalls', displayIfNonZero(entity.drawCalls));
addColumn('hasScript glyph', entity.hasScript); addColumn('hasScript glyph', entity.hasScript ? SCRIPT_GLYPH : null);
row.addEventListener('click', onRowClicked); row.addEventListener('click', onRowClicked);
row.addEventListener('dblclick', onRowDoubleClicked); row.addEventListener('dblclick', onRowDoubleClicked);