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

Merge branch 'entityListTypeFilter' of github.com:dback2/hifi into entityListTypeFilter

Browse source
This commit is contained in:
David Back 2018-10-16 14:20:48 -07:00
commit 5ae4425729
3 changed files with 196 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
scripts/system/html/css/edit-style.css
View file

@ -198,7 +198,7 @@ td.url {
} }
input[type="text"], input[type="number"], textarea { input[type="text"], input[type="search"], input[type="number"], textarea {
margin: 0; margin: 0;
padding: 0 12px; padding: 0 12px;
color: #afafaf; color: #afafaf;
@ -257,6 +257,17 @@ input[type="text"] {
width: 100%; width: 100%;
} }
input[type="search"] {
height: 28px;
width: 100%;
}
input[type="search"]::-webkit-search-cancel-button {
-webkit-appearance: none;
height: 20px;
width: 20px;
background-image: url('data:image/png;base64,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')
}
input[type="number"] { input[type="number"] {
position: relative; position: relative;
height: 28px; height: 28px;
@ -1036,38 +1047,86 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
padding-bottom: 24px; padding-bottom: 24px;
} }
#filter-type-multiselect { .multiselect {
position: relative; position: relative;
} }
#filter-type-selectBox { .selectBox {
position: absolute; position: absolute;
} }
#filter-type-selectBox select { .selectBox select {
font-weight: bold; font-family: FiraSans-SemiBold;
font-family: FiraSans-SemiBold; font-size: 15px;
color: #404040; color: #afafaf;
background-color: #afafaf; background-color: #252525;
border: none;
height: 28px;
width: 107px;
text-align-last: center;
} }
.overSelect {
position: absolute;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
#filter-type-checkboxes { #filter-type-checkboxes {
position: absolute; position: absolute;
top: 20px; z-index: 2;
display: none; top: 28px;
border: 1px #dadada solid; display: none;
border: none;
}
#filter-type-checkboxes div {
position: relative;
height: 25px;
}
#filter-type-checkboxes span {
position: relative;
top: 3px;
font-family: hifi-glyphs;
font-size: 16px;
color: #404040;
padding-left: 12px;
padding-right: 12px;
} }
#filter-type-checkboxes label { #filter-type-checkboxes label {
display: block; position: relative;
font-family: FiraSans-SemiBold; top: -13px;
color: #404040; z-index: 3;
background-color: #afafaf; display: block;
font-family: FiraSans-SemiBold;
color: #404040;
background-color: #afafaf;
padding-top: 1px;
padding-right: 12px;
height: 24px;
} }
#filter-type-checkboxes label:hover { #filter-type-checkboxes label:hover {
background-color: #1e90ff; background-color: #1e90ff;
}
#filter-type-checkboxes input[type=checkbox] {
position: relative;
top: 6px;
right: -10px;
z-index: 4;
display: block;
}
#filter-type-checkboxes input[type=checkbox] + label {
background-image: none;
}
#filter-type-checkboxes input[type=checkbox]:checked + label {
background-image: none;
}
#filter-type-checkboxes input[type=checkbox]:hover + label {
background-color: #1e90ff;
} }
#filter-search-and-icon { #filter-search-and-icon {
position: absolute; position: absolute;
left: 100px; left: 120px;
width: 60%; width: calc(100% - 300px);
} }
#filter-in-view { #filter-in-view {
@ -1076,7 +1135,7 @@ textarea:enabled[scrolling="true"]::-webkit-resizer {
} }
#filter-radius-and-unit { #filter-radius-and-unit {
position: relative; position: relative;
float: right; float: right;
margin-right: -168px; margin-right: -168px;
top: -17px; top: -17px;

11
scripts/system/html/entityList.html
View file

@ -31,16 +31,19 @@
</div> </div>
<div id="entity-list"> <div id="entity-list">
<div id="filter-area"> <div id="filter-area">
<div class="filter-type-multiselect"> <div class="multiselect">
<div class="selectBox" id="filter-type-selectBox"> <div class="selectBox" id="filter-type-selectBox">
<select><option>Types...</option></select> <select>
<option id="filter-type-text">All Types</option>
</select>
<div class="overSelect"></div>
</div> </div>
<div id="filter-type-checkboxes"> <div id="filter-type-checkboxes">
<!-- each type checkbox/label is added at runtime in entityList --> <!-- type options with checkbox, icon, and label are added at runtime in entityList -->
</div> </div>
</div> </div>
<div id="filter-search-and-icon"> <div id="filter-search-and-icon">
<span class="icon-input"><input type="text" class="search" id="filter-search" placeholder="Filter" /><span>Y</span></span> <span class="icon-input"><input type="search" class="search" id="filter-search" placeholder="Filter" /><span>Y</span></span>
</div> </div>
<input type="button" id="filter-in-view" class="glyph" value="&#xe007;" /> <input type="button" id="filter-in-view" class="glyph" value="&#xe007;" />
<div id="filter-radius-and-unit" class="number"> <div id="filter-radius-and-unit" class="number">

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

@ -60,17 +60,29 @@ const COMPARE_DESCENDING = function(a, b) {
} }
const FILTER_TYPES = [ const FILTER_TYPES = [
"Shape", "Shape",
"Model", "Model",
"Image", "Image",
"Light", "Light",
"Zone", "Zone",
"Web", "Web",
"Material", "Material",
"ParticleEffect", "ParticleEffect",
"Text", "Text",
]; ];
const ICON_FOR_TYPE = {
Shape: "n",
Model: "&#xe008;",
Image: "&#xe02a;",
Light: "p",
Zone: "o",
Web: "q",
Material: "&#xe00b;",
ParticleEffect: "&#xe004;",
Text: "l",
};
// List of all entities // List of all entities
var entities = [] var entities = []
// List of all entities, indexed by Entity ID // List of all entities, indexed by Entity ID
@ -118,8 +130,9 @@ function loaded() {
elToggleLocked = document.getElementById("locked"); elToggleLocked = document.getElementById("locked");
elToggleVisible = document.getElementById("visible"); elToggleVisible = document.getElementById("visible");
elDelete = document.getElementById("delete"); elDelete = document.getElementById("delete");
elFilterTypeSelectBox = document.getElementById("filter-type-selectBox"); elFilterTypeSelectBox = document.getElementById("filter-type-selectBox");
elFilterTypeCheckboxes = document.getElementById("filter-type-checkboxes"); elFilterTypeText = document.getElementById("filter-type-text");
elFilterTypeCheckboxes = document.getElementById("filter-type-checkboxes");
elFilterSearch = document.getElementById("filter-search"); elFilterSearch = document.getElementById("filter-search");
elFilterInView = document.getElementById("filter-in-view") elFilterInView = document.getElementById("filter-in-view")
elFilterRadius = document.getElementById("filter-radius"); elFilterRadius = document.getElementById("filter-radius");
@ -132,6 +145,7 @@ function loaded() {
elNoEntitiesInView = document.getElementById("no-entities-in-view"); elNoEntitiesInView = document.getElementById("no-entities-in-view");
elNoEntitiesRadius = document.getElementById("no-entities-radius"); elNoEntitiesRadius = document.getElementById("no-entities-radius");
document.body.onclick = onBodyClick;
document.getElementById("entity-name").onclick = function() { document.getElementById("entity-name").onclick = function() {
setSortColumn('name'); setSortColumn('name');
}; };
@ -187,32 +201,34 @@ function loaded() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' })); EventBridge.emitWebEvent(JSON.stringify({ type: 'delete' }));
} }
elFilterSearch.onkeyup = refreshEntityList; elFilterSearch.onkeyup = refreshEntityList;
elFilterSearch.onpaste = refreshEntityList; elFilterSearch.onsearch = refreshEntityList;
elFilterSearch.onchange = onFilterChange;
elFilterSearch.onblur = refreshFooter;
elFilterInView.onclick = toggleFilterInView; elFilterInView.onclick = toggleFilterInView;
elFilterRadius.onchange = onRadiusChange; elFilterRadius.onchange = onRadiusChange;
elInfoToggle.onclick = toggleInfo; elInfoToggle.onclick = toggleInfo;
// create filter type dropdown checkboxes w/ label for each type // create filter type dropdown checkboxes with label and icon for each type
elFilterTypeSelectBox.onclick = toggleTypeDropdown; elFilterTypeSelectBox.onclick = toggleTypeDropdown;
for (let i = 0; i < FILTER_TYPES.length; ++i) { for (let i = 0; i < FILTER_TYPES.length; ++i) {
let type = FILTER_TYPES[i]; let type = FILTER_TYPES[i];
let typeFilterID = "filter-type-" + type; let typeFilterID = "filter-type-" + type;
let elDiv = document.createElement('div'); let elDiv = document.createElement('div');
let elLabel = document.createElement('label'); let elLabel = document.createElement('label');
elLabel.setAttribute("for", typeFilterID); elLabel.setAttribute("for", typeFilterID);
elLabel.innerText = type; elLabel.innerText = type;
let elInput = document.createElement('input'); let elSpan = document.createElement('span');
elInput.setAttribute("type", "checkbox"); elSpan.setAttribute("class", "typeIcon");
elInput.setAttribute("id", typeFilterID); elSpan.innerHTML = ICON_FOR_TYPE[type];
elInput.checked = true; // all types are checked initially let elInput = document.createElement('input');
toggleTypeFilter(type, false); // add all types to the initial type filter elInput.setAttribute("type", "checkbox");
elInput.onclick = onToggleTypeFilter(type); elInput.setAttribute("id", typeFilterID);
elDiv.appendChild(elInput); elInput.checked = true; // all types are checked initially
elDiv.appendChild(elLabel); toggleTypeFilter(type, false); // add all types to the initial types filter
elFilterTypeCheckboxes.appendChild(elDiv); elInput.onclick = onToggleTypeFilter(type);
} elDiv.appendChild(elInput);
elLabel.insertBefore(elSpan, elLabel.childNodes[0]);
elDiv.appendChild(elLabel);
elFilterTypeCheckboxes.appendChild(elDiv);
}
elNoEntitiesInView.style.display = "none"; elNoEntitiesInView.style.display = "none";
@ -336,16 +352,16 @@ function loaded() {
function refreshEntityList() { function refreshEntityList() {
PROFILE("refresh-entity-list", function() { PROFILE("refresh-entity-list", function() {
PROFILE("filter", function() { PROFILE("filter", function() {
let searchTerm = elFilterSearch.value.toLowerCase(); let searchTerm = elFilterSearch.value.toLowerCase();
visibleEntities = entities.filter(function(e) { visibleEntities = entities.filter(function(e) {
let type = e.type === "Box" || e.type === "Sphere" ? "Shape" : e.type; let type = e.type === "Box" || e.type === "Sphere" ? "Shape" : e.type;
let typeFilter = typeFilters.indexOf(type) > -1; let typeFilter = typeFilters.indexOf(type) > -1;
let searchFilter = searchTerm === '' || (e.name.toLowerCase().indexOf(searchTerm) > -1 || let searchFilter = searchTerm === '' || (e.name.toLowerCase().indexOf(searchTerm) > -1 ||
e.type.toLowerCase().indexOf(searchTerm) > -1 || e.type.toLowerCase().indexOf(searchTerm) > -1 ||
e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 || e.fullUrl.toLowerCase().indexOf(searchTerm) > -1 ||
e.id.toLowerCase().indexOf(searchTerm) > -1); e.id.toLowerCase().indexOf(searchTerm) > -1);
return typeFilter && searchFilter; return typeFilter && searchFilter;
}); });
}); });
PROFILE("sort", function() { PROFILE("sort", function() {
@ -632,11 +648,6 @@ function loaded() {
refreshEntities(); refreshEntities();
} }
function onFilterChange() {
refreshEntityList();
entityList.resize();
}
function onRadiusChange() { function onRadiusChange() {
elFilterRadius.value = Math.max(elFilterRadius.value, 0); elFilterRadius.value = Math.max(elFilterRadius.value, 0);
elNoEntitiesRadius.firstChild.nodeValue = elFilterRadius.value; elNoEntitiesRadius.firstChild.nodeValue = elFilterRadius.value;
@ -644,29 +655,51 @@ function loaded() {
EventBridge.emitWebEvent(JSON.stringify({ type: 'radius', radius: elFilterRadius.value })); EventBridge.emitWebEvent(JSON.stringify({ type: 'radius', radius: elFilterRadius.value }));
refreshEntities(); refreshEntities();
} }
function toggleTypeDropdown() { function isTypeDropdownVisible() {
elFilterTypeCheckboxes.style.display = elFilterTypeCheckboxes.style.display === "block" ? "none" : "block"; return elFilterTypeCheckboxes.style.display === "block";
} }
function toggleTypeFilter(type, refresh) { function toggleTypeDropdown() {
let typeFilterIndex = typeFilters.indexOf(type); elFilterTypeCheckboxes.style.display = isTypeDropdownVisible() ? "none" : "block";
if (typeFilterIndex > -1) { }
typeFilters.splice(typeFilterIndex, 1);
} else { function toggleTypeFilter(type, refresh) {
typeFilters.push(type); let typeFilterIndex = typeFilters.indexOf(type);
} if (typeFilterIndex > -1) {
if (refresh) { typeFilters.splice(typeFilterIndex, 1);
refreshEntityList(); } else {
} typeFilters.push(type);
} }
function onToggleTypeFilter(type) { if (typeFilters.length === 0) {
return function() { elFilterTypeText.innerText = "No Types";
toggleTypeFilter(type, true); } else if (typeFilters.length === FILTER_TYPES.length) {
}; elFilterTypeText.innerText = "All Types";
} } else {
elFilterTypeText.innerText = "Types...";
}
if (refresh) {
refreshEntityList();
}
}
function onToggleTypeFilter(type) {
return function() {
toggleTypeFilter(type, true);
};
}
function onBodyClick(event) {
// if clicking anywhere outside of the type filter dropdown and it's open then close it
let elTarget = event.target;
if (isTypeDropdownVisible() && !elFilterTypeSelectBox.contains(elTarget) &&
!elFilterTypeCheckboxes.contains(elTarget)) {
toggleTypeDropdown();
}
}
function toggleInfo(event) { function toggleInfo(event) {
showExtraInfo = !showExtraInfo; showExtraInfo = !showExtraInfo;
if (showExtraInfo) { if (showExtraInfo) {
@ -679,7 +712,7 @@ function loaded() {
entityList.resize(); entityList.resize();
event.stopPropagation(); event.stopPropagation();
} }
document.addEventListener("keydown", function (keyDownEvent) { document.addEventListener("keydown", function (keyDownEvent) {
if (keyDownEvent.target.nodeName === "INPUT") { if (keyDownEvent.target.nodeName === "INPUT") {
return; return;
@ -731,7 +764,7 @@ function loaded() {
refreshSortOrder(); refreshSortOrder();
refreshEntities(); refreshEntities();
}); });
augmentSpinButtons(); augmentSpinButtons();