Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch label on markers to be stored as HTML fragment

Browse source
This commit is contained in:
Mike Primm 2022-01-12 20:48:28 -06:00
parent a19674c20c
commit 04ef31fa3b
7 changed files with 83 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

18
DynmapCore/src/main/resources/extracted/web/js/markers.js
View file

@ -105,19 +105,12 @@ componentconstructors['markers'] = function(dynmap, configuration) {
.addClass('Marker')
.addClass('mapMarker')
.append($('<img/>').addClass('markerIcon'+marker.dim).attr({ src: url }));
if(marker.markup) {
if (marker.label != "")
$(div).append($('<span/>')
.addClass(set.showlabels?'markerName-show':'markerName')
.addClass('markerName_' + set.id)
.addClass('markerName' + marker.dim)
.append(marker.label));
}
else if(marker.label != "")
$(div).append($('<span/>')
.addClass(set.showlabels?'markerName-show':'markerName')
.addClass('markerName_' + set.id)
.addClass('markerName' + marker.dim)
.text(marker.label));
return div;
}});
marker.timestamp = ts;
@ -191,9 +184,6 @@ componentconstructors['markers'] = function(dynmap, configuration) {
if(area.desc) {
$(popup).addClass('AreaPopup').append(area.desc);
}
else if(area.markup) {
$(popup).addClass('AreaPopup').append(area.label);
}
else {
$(popup).text(area.label);
}
@ -224,9 +214,6 @@ componentconstructors['markers'] = function(dynmap, configuration) {
if(line.desc) {
$(popup).addClass('LinePopup').append(line.desc);
}
else if(line.markup) {
$(popup).addClass('LinePopup').append(line.label);
}
else {
$(popup).text(line.label);
}
@ -259,9 +246,6 @@ componentconstructors['markers'] = function(dynmap, configuration) {
if(circle.desc) {
$(popup).addClass('CirclePopup').append(circle.desc);
}
else if(circle.markup) {
$(popup).addClass('CirclePopup').append(circle.label);
}
else {
$(popup).text(circle.label);
}