backups/Fantasy-Map-Generator
1
0
Fork 0
mirror of https://github.com/Azgaar/Fantasy-Map-Generator.git synced 2025-12-22 12:01:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

markers overview

Browse source
This commit is contained in:
Azgaar 2021-09-27 01:07:36 +03:00 • committed by Peter
parent 26e5413090
commit 6d6dc22a75
5 changed files with 3 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/ui/general.js
View file

@ -74,13 +74,8 @@ function showElementLockTip(event) {
}
}
<<<<<<< HEAD
const onMouseMove = debounce(handleMouseMove, 100);
function handleMouseMove() {
=======
const moved = debounce(mouseMove, 100);
function mouseMove() {
>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
const point = d3.mouse(this);
const i = findCell(point[0], point[1]); // pack cell id
if (i === undefined) return;
@ -126,15 +121,11 @@ function showMapTooltip(point, e, i, g) {
if (group === "emblems" && e.target.tagName === "use") {
const parent = e.target.parentNode;
const [g, type] =
<<<<<<< HEAD
parent.id === "burgEmblems"
? [pack.burgs, "burg"]
: parent.id === "provinceEmblems"
? [pack.provinces, "province"]
: [pack.states, "state"];
=======
parent.id === "burgEmblems" ? [pack.burgs, "burg"] : parent.id === "provinceEmblems" ? [pack.provinces, "province"] : [pack.states, "state"];
>>>>>>> 01fbfca0 (markers - generate tool + lock tooltip)
const i = +e.target.dataset.i;
if (event.shiftKey) highlightEmblemElement(type, g[i]);