From d44cca032e3e9d8a4a5c9a400a3d874d00fbd3ab Mon Sep 17 00:00:00 2001 From: Onyx Azryn Date: Sat, 10 Oct 2020 09:40:48 -0500 Subject: [PATCH] Fixed Spacing --- modules/ui/general.js | 4 ++-- modules/ui/lakes-editor.js | 4 ++-- modules/ui/measurers.js | 2 +- modules/ui/namesbase-editor.js | 6 +++--- modules/ui/notes-editor.js | 5 ++--- modules/ui/provinces-editor.js | 1 - modules/ui/regiment-editor.js | 3 +-- modules/ui/relief-editor.js | 1 - modules/ui/religions-editor.js | 5 ++--- modules/ui/rivers-editor.js | 1 - modules/ui/rivers-overview.js | 1 - modules/ui/routes-editor.js | 4 ++-- modules/ui/states-editor.js | 2 +- modules/ui/style.js | 2 +- modules/ui/units-editor.js | 3 --- modules/ui/world-configurator.js | 2 +- modules/ui/zones-editor.js | 1 - 17 files changed, 18 insertions(+), 29 deletions(-) diff --git a/modules/ui/general.js b/modules/ui/general.js index e0021f14..330318bb 100644 --- a/modules/ui/general.js +++ b/modules/ui/general.js @@ -63,8 +63,8 @@ function moved() { function showNotes(e, i) { if (notesEditor.offsetParent) return; let id = e.target.id || e.target.parentNode.id || e.target.parentNode.parentNode.id; - if (e.target.parentNode.parentNode.id === "burgLabels" || e.target.parentNode.parentNode.id === "burgIcons") id - = "burg" + e.target.dataset.id; + if (e.target.parentNode.parentNode.id === "burgLabels" || e.target.parentNode.parentNode.id === "burgIcons") + id = "burg" + e.target.dataset.id; const note = notes.find(note => note.id === id); if (note !== undefined && note.legend !== "") { diff --git a/modules/ui/lakes-editor.js b/modules/ui/lakes-editor.js index c0172ea3..6acbbf7e 100644 --- a/modules/ui/lakes-editor.js +++ b/modules/ui/lakes-editor.js @@ -147,7 +147,7 @@ function editLake() { toggleNewGroupInput(); document.getElementById("lakeGroupName").value = ""; } - + function removeLakeGroup() { const group = elSelected.node().parentNode.id; if (["freshwater", "salt", "sinkhole", "frozen", "lava", "dry"].includes(group)) { @@ -190,4 +190,4 @@ function editLake() { debug.select("#vertices").remove(); unselect(); } -} \ No newline at end of file +} diff --git a/modules/ui/measurers.js b/modules/ui/measurers.js index 95c1ee84..ef6360b1 100644 --- a/modules/ui/measurers.js +++ b/modules/ui/measurers.js @@ -274,4 +274,4 @@ function fitScaleBar() { const bbox = scaleBar.select("rect").node().getBBox(); const x = rn(svgWidth * px - bbox.width + 10), y = rn(svgHeight * py - bbox.height + 20); scaleBar.attr("transform", `translate(${x},${y})`); -} \ No newline at end of file +} diff --git a/modules/ui/namesbase-editor.js b/modules/ui/namesbase-editor.js index baf0acb5..c2f06a13 100644 --- a/modules/ui/namesbase-editor.js +++ b/modules/ui/namesbase-editor.js @@ -114,7 +114,7 @@ function editNamesbase() { const depth = rn(d3.mean(Object.keys(chain).map(key => chain[key].filter(c => c !== " ").length))); const nonLatin = (string.match(/[^\u0000-\u007f]/g)||["none"]).join(""); - const lengthStat = + const lengthStat = l < 30 ? "[not enough]" : l < 150 ? "[low]" : l < 150 ? "[low]" : @@ -122,13 +122,13 @@ function editNamesbase() { l < 600 ? "[overmuch]" : "[overmuch]"; - const rangeStat = + const rangeStat = l < 10 ? "[low]" : l < 15 ? "[low]" : l < 20 ? "[low]" : "[good]"; - const depthStat = + const depthStat = l < 15 ? "[low]" : l < 20 ? "[low]" : l < 25 ? "[low]" : diff --git a/modules/ui/notes-editor.js b/modules/ui/notes-editor.js index c273c61e..6e1906bd 100644 --- a/modules/ui/notes-editor.js +++ b/modules/ui/notes-editor.js @@ -92,7 +92,7 @@ function editNotes(id, name) { }); return; } - + highlightElement(element); // if element is found } @@ -127,5 +127,4 @@ function editNotes(id, name) { if (!notes.length) {$("#notesEditor").dialog("close"); return;} editNotes(notes[0].id, notes[0].name); } - -} \ No newline at end of file +} diff --git a/modules/ui/provinces-editor.js b/modules/ui/provinces-editor.js index 3d64fafc..dca4565d 100644 --- a/modules/ui/provinces-editor.js +++ b/modules/ui/provinces-editor.js @@ -861,4 +861,3 @@ function editProvinces() { } } - diff --git a/modules/ui/regiment-editor.js b/modules/ui/regiment-editor.js index 881ce3bf..00b4e0fa 100644 --- a/modules/ui/regiment-editor.js +++ b/modules/ui/regiment-editor.js @@ -343,5 +343,4 @@ function editRegiment(selector) { restoreDefaultEvents(); elSelected = null; } - -} \ No newline at end of file +} diff --git a/modules/ui/relief-editor.js b/modules/ui/relief-editor.js index a3653aa2..695788f9 100644 --- a/modules/ui/relief-editor.js +++ b/modules/ui/relief-editor.js @@ -255,5 +255,4 @@ function editReliefIcon() { unselect(); clearMainTip(); } - } diff --git a/modules/ui/religions-editor.js b/modules/ui/religions-editor.js index 704ff531..0ee6c9da 100644 --- a/modules/ui/religions-editor.js +++ b/modules/ui/religions-editor.js @@ -626,11 +626,10 @@ function editReligions() { const name = getFileName("Religions") + ".csv"; downloadFile(data, name); } - + function closeReligionsEditor() { debug.select("#religionCenters").remove(); exitReligionsManualAssignment("close"); exitAddReligionMode(); } - -} \ No newline at end of file +} diff --git a/modules/ui/rivers-editor.js b/modules/ui/rivers-editor.js index cf25f04f..c17bedcd 100644 --- a/modules/ui/rivers-editor.js +++ b/modules/ui/rivers-editor.js @@ -288,5 +288,4 @@ function editRiver(id) { debug.select("#controlPoints").remove(); unselect(); } - } diff --git a/modules/ui/rivers-overview.js b/modules/ui/rivers-overview.js index 6207b14d..c9711190 100644 --- a/modules/ui/rivers-overview.js +++ b/modules/ui/rivers-overview.js @@ -171,5 +171,4 @@ function overviewRivers() { rivers.selectAll("*").remove(); riversOverviewAddLines(); } - } diff --git a/modules/ui/routes-editor.js b/modules/ui/routes-editor.js index 78c84f8d..5e2e0eb0 100644 --- a/modules/ui/routes-editor.js +++ b/modules/ui/routes-editor.js @@ -51,7 +51,7 @@ function editRoute(onClick) { for (let i=0; i <= l; i += increment) {addControlPoint(node.getPointAtLength(i));} routeLength.innerHTML = rn(l * distanceScaleInput.value) + " " + distanceUnitInput.value; } - + function addControlPoint(point) { debug.select("#controlPoints").append("circle") .attr("cx", point.x).attr("cy", point.y).attr("r", .8) @@ -219,7 +219,7 @@ function editRoute(onClick) { if (routeSplit.classList.contains("pressed")) splitRoute(this); else {this.remove(); redrawRoute();} } - + function splitRoute(clicked) { lineGen.curve(d3.curveCatmullRom.alpha(.1)); const group = d3.select(elSelected.node().parentNode); diff --git a/modules/ui/states-editor.js b/modules/ui/states-editor.js index f4c123a7..50f5dca5 100644 --- a/modules/ui/states-editor.js +++ b/modules/ui/states-editor.js @@ -897,7 +897,7 @@ function editStates() { body.querySelectorAll("div > input, select, span, svg").forEach(e => e.style.pointerEvents = "all"); if (statesAdd.classList.contains("pressed")) statesAdd.classList.remove("pressed"); } - + function downloadStatesData() { const unit = areaUnit.value === "square" ? distanceUnitInput.value + "2" : areaUnit.value; let data = "Id,State,Form,Color,Capital,Culture,Type,Expansionism,Cells,Burgs,Area "+unit+",Total Population,Rural Population,Urban Population\n"; // headers diff --git a/modules/ui/style.js b/modules/ui/style.js index db85fe8a..469d3ea4 100644 --- a/modules/ui/style.js +++ b/modules/ui/style.js @@ -1119,4 +1119,4 @@ function updateFontOptions() { opt.style.fontFamily = opt.innerHTML = font; styleSelectFont.add(opt); } -} \ No newline at end of file +} diff --git a/modules/ui/units-editor.js b/modules/ui/units-editor.js index d545c128..09b63f8e 100644 --- a/modules/ui/units-editor.js +++ b/modules/ui/units-editor.js @@ -251,7 +251,4 @@ function editUnits() { } }); } - - } - diff --git a/modules/ui/world-configurator.js b/modules/ui/world-configurator.js index ffcef39f..98f1626d 100644 --- a/modules/ui/world-configurator.js +++ b/modules/ui/world-configurator.js @@ -132,4 +132,4 @@ function editWorld() { lock("latitude"); updateWorld(); } -} \ No newline at end of file +} diff --git a/modules/ui/zones-editor.js b/modules/ui/zones-editor.js index 7e751b7c..5470a056 100644 --- a/modules/ui/zones-editor.js +++ b/modules/ui/zones-editor.js @@ -406,5 +406,4 @@ function editZones() { unfog("focusZone"+zone); zonesEditorAddLines(); } - }