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

v1.5.34 - fixed #567

Browse source
This commit is contained in:
Azgaar 2021-02-15 15:33:01 +03:00
parent 380e0babb2
commit cd7b9549c0
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/jquery-ui.css vendored
View file

@ -434,6 +434,9 @@ body .ui-dialog {
font-family: Arial,Helvetica,sans-serif; font-family: Arial,Helvetica,sans-serif;
font-size: 1em; font-size: 1em;
} }
.ui-widget button {
padding: 1px 6px;
}
.ui-widget.ui-widget-content { .ui-widget.ui-widget-content {
border: 1px solid #5e4fa2; border: 1px solid #5e4fa2;
color: #333333; color: #333333;

28
modules/ui/emblems-editor.js
View file

@ -13,7 +13,7 @@ function editEmblem(type, id, el) {
updateElementSelectors(type, id, el); updateElementSelectors(type, id, el);
$("#emblemEditor").dialog({ $("#emblemEditor").dialog({
title: "Edit Emblem", resizable: true, width: "18em", height: "auto", title: "Edit Emblem", resizable: true, width: "18.2em", height: "auto",
position: {my: "left top", at: "left+10 top+10", of: "svg", collision: "fit"}, position: {my: "left top", at: "left+10 top+10", of: "svg", collision: "fit"},
close: closeEmblemEditor close: closeEmblemEditor
}); });
@ -233,10 +233,10 @@ function editEmblem(type, id, el) {
buttons.classList.toggle("hidden"); buttons.classList.toggle("hidden");
} }
function download(format) { async function download(format) {
const coa = document.getElementById(id); const coa = document.getElementById(id);
const size = +emblemsDownloadSize.value; const size = +emblemsDownloadSize.value;
const url = getURL(coa, el.coa, size); const url = await getURL(coa, size);
const link = document.createElement("a"); const link = document.createElement("a");
link.download = getFileName(`Emblem ${el.fullName || el.name}`) + "." + format; link.download = getFileName(`Emblem ${el.fullName || el.name}`) + "." + format;
@ -247,7 +247,6 @@ function editEmblem(type, id, el) {
function downloadSVG(url, link) { function downloadSVG(url, link) {
link.href = url; link.href = url;
link.click(); link.click();
window.setTimeout(() => window.URL.revokeObjectURL(URL), 5000);
} }
function downloadRaster(format, url, link, size) { function downloadRaster(format, url, link, size) {
@ -264,25 +263,22 @@ function editEmblem(type, id, el) {
ctx.fillRect(0, 0, canvas.width, canvas.height); ctx.fillRect(0, 0, canvas.width, canvas.height);
} }
ctx.drawImage(img, 0, 0, canvas.width, canvas.height); ctx.drawImage(img, 0, 0, canvas.width, canvas.height);
const URL = canvas.toDataURL("image/" + format, .92); const dataURL = canvas.toDataURL("image/" + format, .92);
link.href = URL; link.href = dataURL;
link.click(); link.click();
window.setTimeout(() => window.URL.revokeObjectURL(URL), 5000); window.setTimeout(() => window.URL.revokeObjectURL(dataURL), 6000);
} }
} }
function getURL(svg, coa, size) { async function getURL(svg, size) {
const serialized = getSVG(svg, coa, size);
const blob = new Blob([serialized], { type: 'image/svg+xml;charset=utf-8' });
const url = window.URL.createObjectURL(blob);
return url;
}
function getSVG(svg, size) {
const clone = svg.cloneNode(true); // clone svg const clone = svg.cloneNode(true); // clone svg
clone.setAttribute("width", size); clone.setAttribute("width", size);
clone.setAttribute("height", size); clone.setAttribute("height", size);
return (new XMLSerializer()).serializeToString(clone); const serialized = (new XMLSerializer()).serializeToString(clone);
const blob = new Blob([serialized], {type: 'image/svg+xml;charset=utf-8'});
const url = window.URL.createObjectURL(blob);
window.setTimeout(() => window.URL.revokeObjectURL(url), 6000);
return url;
} }
function downloadGallery() { function downloadGallery() {