This commit is contained in:
Azgaar 2019-09-12 03:04:18 +03:00
parent 2e60c6a1a6
commit 8157585533
7 changed files with 49 additions and 45 deletions

View file

@ -418,7 +418,7 @@ function getHeight(h) {
function openBrushesPanel() {
if ($("#brushesPanel").is(":visible")) return;
$("#brushesPanel").dialog({
title: "Paint Brushes", minHeight: 40, width: "auto", maxWidth: 200, resizable: false,
title: "Paint Brushes", resizable: false,
position: {my: "right top", at: "right-10 top+10", of: "svg"}
}).on('dialogclose', exitBrushMode);

View file

@ -27,7 +27,7 @@ function editNotes(id, name) {
// open a dialog
$("#notesEditor").dialog({
title: "Notes Editor", minWidth: Math.min(svgWidth, 400),
title: "Notes Editor", minWidth: "40em",
position: {my: "center", at: "center", of: "svg"}
});

View file

@ -61,8 +61,9 @@ options.querySelector("div.tab").addEventListener("click", function(event) {
if (id === "styleTab") styleContent.style.display = "block"; else
if (id === "optionsTab") optionsContent.style.display = "block"; else
if (id === "toolsTab" && (!customization || customization === 10)) toolsContent.style.display = "block"; else
if (id === "toolsTab" && customization && customization !== 10) customizationMenu.style.display = "block"; else
if (id === "toolsTab") customization === 1
? customizationMenu.style.display = "block"
: toolsContent.style.display = "block"; else
if (id === "aboutTab") aboutContent.style.display = "block";
});
@ -601,9 +602,9 @@ function askToRestoreDefaultStyle() {
// request a URL to image to be used as a texture
function textureProvideURL() {
alertMessage.innerHTML = `Provide an image URL to be used as a texture:
<input id="textureURL" type="url" style="width: 254px" placeholder="http://www.example.com/image.jpg" oninput="fetchTextureURL(this.value)">
<input id="textureURL" type="url" style="width: 24em" placeholder="http://www.example.com/image.jpg" oninput="fetchTextureURL(this.value)">
<div style="border: 1px solid darkgrey; height: 144px; margin-top: 2px"><canvas id="preview" width="256px" height="144px"></canvas></div>`;
$("#alert").dialog({resizable: false, title: "Load custom texture", width: 280,
$("#alert").dialog({resizable: false, title: "Load custom texture", width: "26em",
buttons: {
Apply: function() {
const name = textureURL.value.split("/").pop();
@ -679,6 +680,7 @@ optionsContent.addEventListener("input", function(event) {
else if (id === "manorsInput") changeBurgsNumberSlider(value);
else if (id === "religionsInput") religionsOutput.value = value;
else if (id === "uiSizeInput") uiSizeOutput.value = value;
else if (id === "uiSizeOutput") changeUIsize(value);
else if (id === "tooltipSizeInput" || id === "tooltipSizeOutput") changeTooltipSize(value);
else if (id === "transparencyInput") changeDialogsTransparency(value);
else if (id === "pngResolutionInput") pngResolutionOutput.value = value;
@ -690,7 +692,7 @@ optionsContent.addEventListener("change", function(event) {
const id = event.target.id, value = event.target.value;
if (id === "zoomExtentMin" || id === "zoomExtentMax") changeZoomExtent(value);
else if (id === "optionsSeed") generateMapWithSeed();
else if (id === "uiSizeInput" || id === "uiSizeOutput") changeUIsize(value);
else if (id === "uiSizeInput") changeUIsize(value);
});
optionsContent.addEventListener("click", function(event) {
@ -862,7 +864,7 @@ function applyStoredOptions() {
if (localStorage.getItem("regions")) changeStatesNumber(localStorage.getItem("regions"));
if (localStorage.getItem("uiSize")) changeUIsize(localStorage.getItem("uiSize"));
else changeUIsize(Math.max(Math.min(rn(mapWidthInput.value / 1230, 1), 3), 1));
else changeUIsize(Math.max(Math.min(rn(mapWidthInput.value / 1280, 1), 2.5), 1));
}
// randomize options if randomization is allowed (not locked)
@ -1064,10 +1066,10 @@ function toggleLoadPane() {
function loadURL() {
const pattern = /(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/;
const inner = `Provide URL to a .map file:
<input id="mapURL" type="url" style="width: 254px" placeholder="https://e-cloud.com/test.map">
<input id="mapURL" type="url" style="width: 24em" placeholder="https://e-cloud.com/test.map">
<br><i>Please note server should allow CORS for file to be loaded. If CORS is not allowed, save file to Dropbox and provide a direct link</i>`;
alertMessage.innerHTML = inner;
$("#alert").dialog({resizable: false, title: "Load map from URL", width: 280,
$("#alert").dialog({resizable: false, title: "Load map from URL", width: "26em",
buttons: {
Load: function() {
const value = mapURL.value;

View file

@ -12,7 +12,7 @@ function editReliefIcon() {
updateReliefSizeInput();
$("#reliefEditor").dialog({
title: "Edit Relief Icons", resizable: false, width: 294,
title: "Edit Relief Icons", resizable: false, width: "27em",
position: {my: "left top", at: "left+10 top+10", of: "#map"},
close: closeReliefEditor
});

View file

@ -340,7 +340,7 @@ function addRiverOnClick() {
alertMessage.innerHTML = `<p>Heightmap is depressed and the system had to change the heightmap to allow water flux.</p>
Would you like to <i>keep</i> the changes or <i>restore</i> the initial heightmap?`;
$("#alert").dialog({resizable: false, title: "Heightmap is changed", width: 300, modal: true,
$("#alert").dialog({resizable: false, title: "Heightmap is changed", width: "30em", modal: true,
buttons: {
Keep: function() {$(this).dialog("close");},
Restore: function() {