Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-27 20:58:40 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Mike Primm 2022-06-19 13:35:03 -05:00
commit 69cd5777fc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
DynmapCore/src/main/resources/extracted/web/index.html
View File

@ -10,7 +10,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no" />
<!-- 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-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" />
@ -54,4 +55,4 @@
<div id="mcmap"></div>
</body>
</html>
</html>

2
DynmapCore/src/main/resources/extracted/web/js/markers.js
View File

@ -27,7 +27,7 @@ componentconstructors['markers'] = function(dynmap, configuration) {
function loadmarkers(world) {
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) {
var ts = data.timestamp;