Merge branch 'v3.0' of git@github-home:webbukkit/dynmap.git into v3.0

This commit is contained in:
Mike Primm 2022-06-19 13:35:03 -05:00
commit 96d14566b5
2 changed files with 4 additions and 3 deletions

View file

@ -11,6 +11,7 @@
<!-- These 2 lines make us fullscreen on apple mobile products - remove if you don't like that --> <!-- These 2 lines make us fullscreen on apple mobile products - remove if you don't like that -->
<meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<meta name="theme-color" content="#000000">
<link rel="icon" href="images/dynmap.ico" type="image/ico" /> <link rel="icon" href="images/dynmap.ico" type="image/ico" />

View file

@ -27,7 +27,7 @@ componentconstructors['markers'] = function(dynmap, configuration) {
function loadmarkers(world) { function loadmarkers(world) {
removeAllMarkers(); removeAllMarkers();
var url = concatURL(dynmap.options.url.markers, '_markers_/marker_'+world+'.json'); var url = concatURL(dynmap.options.url.markers, '_markers_/marker_' + encodeURIComponent(world) + '.json');
$.getJSON(url, function(data) { $.getJSON(url, function(data) {
var ts = data.timestamp; var ts = data.timestamp;