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

CR fixes

Browse source
This commit is contained in:
David Back 2018-11-13 11:13:00 -08:00
parent b5ec04a534
commit 0b0614c84a
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -167,7 +167,7 @@ let entityList = null; // The ListView
*/ */
let entityListContextMenu = null; let entityListContextMenu = null;
let currentSortColumn = null; let currentSortColumn = 'type';
let currentSortOrder = ASCENDING_SORT; let currentSortOrder = ASCENDING_SORT;
let elSortOrders = {}; let elSortOrders = {};
let typeFilters = []; let typeFilters = [];
@ -181,6 +181,7 @@ let resizeColumnIndex = 0;
let startThClick = null; let startThClick = null;
let elEntityTable, let elEntityTable,
elEntityTableHeader,
elEntityTableBody, elEntityTableBody,
elEntityTableScroll, elEntityTableScroll,
elEntityTableHeaderRow, elEntityTableHeaderRow,
@ -188,19 +189,19 @@ let elEntityTable,
elToggleLocked, elToggleLocked,
elToggleVisible, elToggleVisible,
elDelete, elDelete,
elFilterTypeSelectBox, elFilterTypeMultiselectBox,
elFilterTypeText, elFilterTypeText,
elFilterTypeCheckboxes, elFilterTypeOptions,
elFilterSearch, elFilterSearch,
elFilterInView, elFilterInView,
elFilterRadius, elFilterRadius,
elExport, elExport,
elPal, elPal,
elInfoToggle,
elInfoToggleGlyph,
elSelectedEntitiesCount, elSelectedEntitiesCount,
elVisibleEntitiesCount, elVisibleEntitiesCount,
elNoEntitiesMessage, elNoEntitiesMessage,
elColumnsMultiselectBox,
elColumnsOptions,
elToggleSpaceMode; elToggleSpaceMode;
const ENABLE_PROFILING = false; const ENABLE_PROFILING = false;
@ -269,7 +270,6 @@ function loaded() {
}; };
elRefresh.onclick = refreshEntities; elRefresh.onclick = refreshEntities;
elFilterTypeMultiselectBox.onclick = onToggleTypeDropdown; elFilterTypeMultiselectBox.onclick = onToggleTypeDropdown;
elFilterTypeSelectBox.onclick = onToggleTypeDropdown;
elFilterSearch.onkeyup = refreshEntityList; elFilterSearch.onkeyup = refreshEntityList;
elFilterSearch.onsearch = refreshEntityList; elFilterSearch.onsearch = refreshEntityList;
elFilterInView.onclick = onToggleFilterInView; elFilterInView.onclick = onToggleFilterInView;
@ -348,10 +348,7 @@ function loaded() {
elTh.appendChild(elSortOrder); elTh.appendChild(elSortOrder);
elHeaderTr.appendChild(elTh); elHeaderTr.appendChild(elTh);
elSortOrders[columnID] = document.querySelector('#' + thID + ' .sort-order'); elSortOrders[columnID] = elSortOrder;
if (currentSortColumn === null) {
currentSortColumn = columnID;
}
// add column to columns dropdown if it is not set to be always shown // add column to columns dropdown if it is not set to be always shown
if (columnData.alwaysShown !== true) { if (columnData.alwaysShown !== true) {
@ -795,7 +792,7 @@ function loaded() {
let elRow = document.createElement("tr"); let elRow = document.createElement("tr");
columns.forEach(function(column) { columns.forEach(function(column) {
let elRowColumn = document.createElement("td"); let elRowColumn = document.createElement("td");
elRowColumn.className = getColumnClassName(column.columnID); elRowColumn.className = createColumnClassName(column.columnID);
elRow.appendChild(elRowColumn); elRow.appendChild(elRowColumn);
}); });
elRow.oncontextmenu = onRowContextMenu; elRow.oncontextmenu = onRowContextMenu;
@ -815,7 +812,7 @@ function loaded() {
elCell.innerText = itemData[column.data.propertyID]; elCell.innerText = itemData[column.data.propertyID];
} }
elCell.style = "min-width:" + column.widthPx + "px;" + "max-width:" + column.widthPx + "px;"; elCell.style = "min-width:" + column.widthPx + "px;" + "max-width:" + column.widthPx + "px;";
elCell.className = getColumnClassName(column.columnID); elCell.className = createColumnClassName(column.columnID);
} }
// if this entity was previously selected flag it's row as selected // if this entity was previously selected flag it's row as selected
@ -890,7 +887,7 @@ function loaded() {
return -1; return -1;
} }
function getColumnClassName(columnID) { function createColumnClassName(columnID) {
let column = columnsByID[columnID]; let column = columnsByID[columnID];
let visible = column.elTh.style.visibility !== "hidden"; let visible = column.elTh.style.visibility !== "hidden";
let className = column.data.glyph ? "glyph" : ""; let className = column.data.glyph ? "glyph" : "";