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

fix fonts load error and reword save dialog text

Browse source
This commit is contained in:
Azgaar 2021-09-08 17:30:32 +03:00
parent d19899f0fc
commit 9adfe70850
4 changed files with 24 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/fonts.js
View file

@ -61,7 +61,7 @@ function convertFontToDataURI(url) {
style.innerHTML = text;
document.head.appendChild(style);
const styleSheet = document.styleSheets.find(sheet => sheet.ownerNode === style);
const styleSheet = Array.from(document.styleSheets).find(sheet => sheet.ownerNode === style);
const FontRule = rule => {
const src = rule.style.getPropertyValue("src");

15
modules/load.js
View file

@ -12,9 +12,10 @@ function quickLoad() {
});
}
async function loadFromDropbox(fileName) {
const map = document.querySelector("#loadFromDropbox select").value;
console.log('loading dropbox map', map);
async function loadFromDropbox() {
const mapPath = document.getElementById("#loadFromDropboxSelect")?.value;
DEBUG && console.log("Loading map from Dropbox:", mapPath);
const blob = await Cloud.providers.dropbox.load(map);
uploadMap(blob);
}
@ -23,18 +24,18 @@ async function createSharableDropboxLink() {
const mapFile = document.querySelector("#loadFromDropbox select").value;
const sharableLink = document.getElementById("sharableLink");
const sharableLinkContainer = document.getElementById("sharableLinkContainer");
let url
let url;
try {
url = await Cloud.providers.dropbox.getLink(mapFile);
} catch {
tip("Dropbox API error. Can not create link.", true, "error", 2000);
return
return;
}
const fmg = window.location.href.split("?")[0];
const reallink= `${fmg}?maplink=${url}`;
const reallink = `${fmg}?maplink=${url}`;
// voodoo magic required by the yellow god of CORS
const link = reallink.replace('www.dropbox.com/s/', 'dl.dropboxusercontent.com/1/view/')
const link = reallink.replace("www.dropbox.com/s/", "dl.dropboxusercontent.com/1/view/");
const shortLink = link.slice(0, 50) + "...";
sharableLinkContainer.style.display = "block";

8
modules/ui/options.js
View file

@ -663,7 +663,7 @@ function showSavePane() {
$("#saveMapData").dialog({
title: "Save map",
resizable: false,
width: "27em",
width: "25em",
position: {my: "center", at: "center", of: "svg"},
buttons: {
Close: function () {
@ -711,11 +711,11 @@ async function showLoadPane() {
const dpx = document.getElementById("loadFromDropbox");
const dpf = dpx.querySelector("select");
const files = await Cloud.providers.dropbox.list();
dpx.style.display = files? "block" : "none";
dpx.style.display = files ? "block" : "none";
if (!files) return;
while(dpf.firstChild) dpf.removeChild(dpf.firstChild);
while (dpf.firstChild) dpf.removeChild(dpf.firstChild);
files.forEach(f => {
const opt = document.createElement('option');
const opt = document.createElement("option");
opt.innerText = f.name;
opt.value = f.path;
dpf.appendChild(opt);