Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-12-29 12:07:41 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #356 from mikeprimm/master

Browse Source 
Band-aid for playermarkers on IE8 - avoid lack of canvas support
This commit is contained in:
mikeprimm 2011-08-01 16:32:17 -07:00
commit 9cc51e4cc0
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/index.html
View File

@ -15,9 +15,9 @@
<link rel="icon" href="images/dynmap.ico" type="image/ico" />
<script type="text/javascript" src="js/jquery.min.js"></script>
<script type="text/javascript" src="js/leaflet.js"></script>
<link rel="stylesheet" type="text/css" href="css/leaflet.css" />
<script type="text/javascript" src="js/leaflet.js"></script>
<script type="text/javascript" src="js/custommarker.js"></script>
<script type="text/javascript" src="js/dynmaputils.js"></script>

6
web/js/map.js
View File

@ -40,6 +40,7 @@ DynMap.prototype = {
inittime: new Date().getTime(),
followingPlayer: '',
missedupdates: 0,
canvassupport: !!document.createElement('canvas').getContext,
formatUrl: function(name, options) {
var url = this.options.url[name];
$.each(options, function(n,v) {
@ -126,7 +127,10 @@ DynMap.prototype = {
me.maptype.updateTileSize(me.map.zoom);
$(me).trigger('zoomchanged');
};
if(me.canvassupport == false)
me.options.showplayerfacesinmenu = false;
/*google.maps.event.addListener(map, 'dragstart', function(mEvent) {
me.followPlayer(null);
});*/

6
web/js/playermarkers.js
View File

@ -9,6 +9,10 @@ componentconstructors['playermarkers'] = function(dynmap, configuration) {
var markerPosition = dynmap.getProjection().fromLocationToLatLng(player.location);
player.marker.setLatLng(markerPosition);
// Only show player faces if canvas supported
if(dynmap.canvassupport == false)
configuration.showplayerfaces = false;
$(div)
.addClass('Marker')
@ -18,7 +22,7 @@ componentconstructors['playermarkers'] = function(dynmap, configuration) {
.append($('<span/>')
.addClass(configuration.smallplayerfaces?'playerNameSm':'playerName')
.text(player.name));
if (configuration.showplayerfaces) {
if(configuration.smallplayerfaces) {
getMinecraftHead(player.account, 16, function(head) {