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

Fix entity list double click rename / highlight issue

Browse source
This commit is contained in:
Thijs Wenker 2018-11-15 02:38:39 +01:00
parent 4d6a3b389a
commit 31d37e7e75
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -153,6 +153,9 @@ const ICON_FOR_TYPE = {
Text: "l", Text: "l",
}; };
const DOUBLE_CLICK_TIMEOUT = 300; // ms
const RENAME_COOLDOWN = 400; // ms
// List of all entities // List of all entities
let entities = []; let entities = [];
// List of all entities, indexed by Entity ID // List of all entities, indexed by Entity ID
@ -181,6 +184,9 @@ let currentResizeEl = null;
let startResizeEvent = null; let startResizeEvent = null;
let resizeColumnIndex = 0; let resizeColumnIndex = 0;
let startThClick = null; let startThClick = null;
let renameTimeout = null;
let renameLastBlur = null;
let renameLastEntityID = null;
let elEntityTable, let elEntityTable,
elEntityTableHeader, elEntityTableHeader,
@ -394,6 +400,7 @@ function loaded() {
entityListContextMenu = new EntityListContextMenu(); entityListContextMenu = new EntityListContextMenu();
function startRenamingEntity(entityID) { function startRenamingEntity(entityID) {
renameLastEntityID = entityID;
let entity = entitiesByID[entityID]; let entity = entitiesByID[entityID];
if (!entity || entity.locked || !entity.elRow) { if (!entity || entity.locked || !entity.elRow) {
return; return;
@ -423,6 +430,8 @@ function loaded() {
})); }));
entity.name = value; entity.name = value;
elCell.innerText = value; elCell.innerText = value;
renameLastBlur = Date.now();
}; };
elCell.innerHTML = ""; elCell.innerHTML = "";
@ -478,6 +487,13 @@ function loaded() {
entityListContextMenu.open(clickEvent, entityID, enabledContextMenuItems); entityListContextMenu.open(clickEvent, entityID, enabledContextMenuItems);
} }
let clearRenameTimeout = () => {
if (renameTimeout !== null) {
window.clearTimeout(renameTimeout);
renameTimeout = null;
}
};
function onRowClicked(clickEvent) { function onRowClicked(clickEvent) {
let entityID = this.dataset.entityID; let entityID = this.dataset.entityID;
let selection = [entityID]; let selection = [entityID];
@ -516,7 +532,15 @@ function loaded() {
} else if (!clickEvent.ctrlKey && !clickEvent.shiftKey && selectedEntities.length === 1) { } else if (!clickEvent.ctrlKey && !clickEvent.shiftKey && selectedEntities.length === 1) {
// if reselecting the same entity then start renaming it // if reselecting the same entity then start renaming it
if (selectedEntities[0] === entityID) { if (selectedEntities[0] === entityID) {
startRenamingEntity(entityID); if (renameLastBlur && renameLastEntityID === entityID && (Date.now() - renameLastBlur) < RENAME_COOLDOWN) {
return;
}
clearRenameTimeout();
renameTimeout = window.setTimeout(() => {
renameTimeout = null;
startRenamingEntity(entityID);
}, DOUBLE_CLICK_TIMEOUT);
} }
} }
@ -530,6 +554,8 @@ function loaded() {
} }
function onRowDoubleClicked() { function onRowDoubleClicked() {
clearRenameTimeout();
let selection = [this.dataset.entityID]; let selection = [this.dataset.entityID];
updateSelectedEntities(selection, false); updateSelectedEntities(selection, false);
@ -1100,12 +1126,12 @@ function loaded() {
startResizeEvent = ev; startResizeEvent = ev;
} }
} }
} };
document.onmouseup = function(ev) { document.onmouseup = function(ev) {
startResizeEvent = null; startResizeEvent = null;
ev.stopPropagation(); ev.stopPropagation();
} };
function setSpaceMode(spaceMode) { function setSpaceMode(spaceMode) {
if (spaceMode === "local") { if (spaceMode === "local") {