Merge branch '2-client-team-names-are-not-shown' into 'master'
ajouté popups Closes #2 See merge request sgay/traque!1
This commit is contained in:
commit
6235e0c14e
1 changed files with 4 additions and 2 deletions
6
map.html
6
map.html
|
@ -85,8 +85,8 @@
|
|||
socket.on("setName", function(data){
|
||||
console.log("setName", data);
|
||||
names[data.id] = data.name;
|
||||
//if(data.id in markers)
|
||||
// markers[data.id].setIcon(icons[data.color]);
|
||||
if(data.id in markers)
|
||||
markers[data.id].bindPopup(data.name);
|
||||
});
|
||||
|
||||
socket.on("changeColor", function(data){
|
||||
|
@ -111,6 +111,8 @@
|
|||
else
|
||||
icon = icons[colors[data.id]];
|
||||
markers[data.id] = L.marker(data.position, {"icon": icon}).addTo(map);
|
||||
if(data.id in names)
|
||||
markers[data.id].bindPopup(names[data.id]);
|
||||
} else{
|
||||
markers[data.id].setLatLng(data.position);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue