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

refactor: map events

Browse source
This commit is contained in:
Azgaar 2022-07-10 02:35:30 +03:00
parent 3c850d8d46
commit ff97c9227d
32 changed files with 433 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/ui/editors.js
View file

@ -1,6 +1,6 @@
import * as d3 from "d3";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {tip} from "scripts/tooltips";
import {findCell} from "utils/graphUtils";
import {minmax, normalize, rn} from "utils/numberUtils";
@ -11,7 +11,7 @@ import {getBurgPopulation} from "utils/unitUtils";
// clear elSelected variable
export function unselect() {
restoreDefaultEvents();
setDefaultEventHandlers();
if (!elSelected) return;
elSelected.call(d3.drag().on("drag", null)).attr("class", null);
debug.selectAll("*").remove();

4
src/modules/ui/markers-editor.js
View file

@ -1,6 +1,6 @@
import * as d3 from "d3";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {findCell} from "utils/graphUtils";
import {clearMainTip} from "scripts/tooltips";
import {rn} from "utils/numberUtils";
@ -271,7 +271,7 @@ export function editMarker(markerI) {
unselect();
addMarker.classList.remove("pressed");
markerAdd.classList.remove("pressed");
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
}
}

4
src/modules/ui/markers-overview.js
View file

@ -1,4 +1,4 @@
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip} from "scripts/tooltips";
import {closeDialogs} from "dialogs/utils";
@ -197,7 +197,7 @@ export function overviewMarkers() {
addMarker.classList.remove("pressed");
markerAdd.classList.remove("pressed");
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
}
}

6
src/modules/ui/provinces-editor.js
View file

@ -4,7 +4,7 @@ import {openDialog} from "dialogs";
import {closeDialogs} from "dialogs/utils";
import {turnLayerButtonOff} from "layers";
import {unfog} from "modules/ui/editors";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, showMainTip, tip} from "scripts/tooltips";
import {unique} from "utils/arrayUtils";
import {getRandomColor} from "utils/colorUtils";
@ -993,7 +993,7 @@ export function editProvinces() {
if (!close)
$("#provincesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
const selected = body.querySelector("div.selected");
if (selected) selected.classList.remove("selected");
@ -1069,7 +1069,7 @@ export function editProvinces() {
function exitAddProvinceMode() {
customization = 0;
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
body.querySelectorAll("div > input, select, span, svg").forEach(e => (e.style.pointerEvents = "all"));
if (provincesAdd.classList.contains("pressed")) provincesAdd.classList.remove("pressed");

10
src/modules/ui/regiment-editor.js
View file

@ -1,6 +1,6 @@
import * as d3 from "d3";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {findCell} from "utils/graphUtils";
import {last} from "utils/arrayUtils";
import {tip, clearMainTip} from "scripts/tooltips";
@ -210,7 +210,7 @@ export function editRegiment(selector) {
tip("Click on map to create new regiment or fleet", true);
} else {
clearMainTip();
restoreDefaultEvents();
setDefaultEventHandlers();
}
}
@ -240,7 +240,7 @@ export function editRegiment(selector) {
armies.selectAll(":scope > g").classed("draggable", false);
} else {
clearMainTip();
restoreDefaultEvents();
setDefaultEventHandlers();
armies.selectAll(":scope > g").classed("draggable", true);
}
}
@ -313,7 +313,7 @@ export function editRegiment(selector) {
} else {
clearMainTip();
armies.selectAll(":scope > g").classed("draggable", true);
restoreDefaultEvents();
setDefaultEventHandlers();
}
}
@ -453,7 +453,7 @@ export function editRegiment(selector) {
document.getElementById("regimentAdd").classList.remove("pressed");
document.getElementById("regimentAttack").classList.remove("pressed");
document.getElementById("regimentAttach").classList.remove("pressed");
restoreDefaultEvents();
setDefaultEventHandlers();
elSelected = null;
}
}

4
src/modules/ui/regiments-overview.js
View file

@ -7,7 +7,7 @@ import {rn} from "utils/numberUtils";
import {capitalize} from "utils/stringUtils";
import {si} from "utils/unitUtils";
import {closeDialogs} from "dialogs/utils";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
let isLoaded = false;
@ -171,7 +171,7 @@ export function overviewRegiments(state) {
if (regimentAdd.offsetParent) regimentAdd.classList.add("pressed");
} else {
clearMainTip();
restoreDefaultEvents();
setDefaultEventHandlers();
addLines();
if (regimentAdd.offsetParent) regimentAdd.classList.remove("pressed");
}

4
src/modules/ui/relief-editor.js
View file

@ -1,6 +1,6 @@
import * as d3 from "d3";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {findCell} from "utils/graphUtils";
import {tip, showMainTip, clearMainTip} from "scripts/tooltips";
import {rn} from "utils/numberUtils";
@ -92,7 +92,7 @@ export function editReliefIcon() {
removeCircle();
updateReliefSizeInput();
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
}

4
src/modules/ui/rivers-creator.js
View file

@ -1,6 +1,6 @@
import * as d3 from "d3";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {getPackPolygon, findCell} from "utils/graphUtils";
import {last} from "utils/arrayUtils";
import {tip, clearMainTip} from "scripts/tooltips";
@ -140,7 +140,7 @@ export function createRiver() {
function closeRiverCreator() {
body.innerHTML = "";
debug.select("#controlCells").remove();
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
const forced = +document.getElementById("toggleCells").dataset.forced;

4
src/modules/ui/routes-editor.js
View file

@ -6,7 +6,7 @@ import {rn} from "utils/numberUtils";
import {getNextId} from "utils/nodeUtils";
import {round} from "utils/stringUtils";
import {closeDialogs} from "dialogs/utils";
import {restoreDefaultEvents} from "../../scripts/events";
import {setDefaultEventHandlers} from "../../scripts/events";
let isLoaded = false;
@ -279,7 +279,7 @@ export function editRoute(onClick) {
elSelected.on("click", null);
} else {
clearMainTip();
restoreDefaultEvents();
setDefaultEventHandlers();
elSelected.on("click", addInterimControlPoint).attr("data-new", null);
}
}

4
src/modules/ui/tools.js
View file

@ -5,7 +5,7 @@ import {closeDialogs} from "dialogs/utils";
import {renderLayer, toggleLayer, turnLayerButtonOn} from "layers";
import {unfog} from "modules/ui/editors";
import {aleaPRNG} from "scripts/aleaPRNG";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {prompt} from "scripts/prompt";
import {clearMainTip, tip} from "scripts/tooltips";
import {last} from "utils/arrayUtils";
@ -465,7 +465,7 @@ function regenerateZones(event) {
function unpressClickToAddButton() {
addFeature.querySelectorAll("button.pressed").forEach(b => b.classList.remove("pressed"));
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
}

4
src/modules/ui/zones-editor.js
View file

@ -2,7 +2,7 @@ import * as d3 from "d3";
import {closeDialogs} from "dialogs/utils";
import {unfog} from "modules/ui/editors";
import {restoreDefaultEvents} from "scripts/events";
import {setDefaultEventHandlers} from "scripts/events";
import {clearMainTip, showMainTip, tip} from "scripts/tooltips";
import {unique} from "utils/arrayUtils";
import {findAll, findCell, getPackPolygon} from "utils/graphUtils";
@ -329,7 +329,7 @@ export function editZones() {
if (!close)
$("#zonesEditor").dialog({position: {my: "right top", at: "right-10 top+10", of: "svg", collision: "fit"}});
restoreDefaultEvents();
setDefaultEventHandlers();
clearMainTip();
zones.selectAll("g").each(function () {
this.removeAttribute("data-init");