mirror of
https://github.com/webbukkit/dynmap.git
synced 2024-12-24 17:47:40 +01:00
Better browser compatiblity
This commit is contained in:
parent
9aaa4c28df
commit
3c7f164823
91
web/map.js
91
web/map.js
@ -202,19 +202,25 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
m.setPosition(mi.position);
|
||||
} else {
|
||||
var contentfun = function(div,mi) {
|
||||
div.className = 'Marker ' + mi.type + 'Marker';
|
||||
div.innerHTML = '<img src="' + mi.type + '.png" /> <span>' + mi.text + '</span>';
|
||||
$(div)
|
||||
.addClass('Marker')
|
||||
.addClass(mi.type + 'Marker')
|
||||
.append($('<img/>').attr({src: mi.type + '.png'}))
|
||||
.append($('<span/>').text(mi.text));
|
||||
};
|
||||
if (mi.type == 'player') {
|
||||
contentfun = function(div, mi) {
|
||||
div.className = 'Marker playerMarker';
|
||||
var span = document.createElement('span');
|
||||
span.className = 'playerName';
|
||||
span.appendChild(document.createTextNode(mi.text));
|
||||
div.appendChild(span);
|
||||
$(div)
|
||||
.addClass('Marker')
|
||||
.addClass('playerMarker')
|
||||
.append($('<span/>')
|
||||
.addClass('playerName')
|
||||
.text(mi.text));
|
||||
|
||||
getMinecraftHead(mi.text, 32, function(head) {
|
||||
head.className = 'playerIcon';
|
||||
div.insertBefore(head, div.firstChild);
|
||||
$(head)
|
||||
.addClass('playerIcon')
|
||||
.prependTo(div);
|
||||
});
|
||||
};
|
||||
}
|
||||
@ -224,38 +230,33 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
markers[mi.id] = marker;
|
||||
|
||||
if (mi.type == 'player') {
|
||||
var playerRow = document.createElement('div');
|
||||
playerRow.id = 'playerrow_' + mi.text;
|
||||
playerRow.className = 'playerrow';
|
||||
|
||||
var followButton = document.createElement('input');
|
||||
followButton.type = 'checkbox';
|
||||
followButton.name = 'followPlayer';
|
||||
followButton.checked = false;
|
||||
followButton.value = mi.text;
|
||||
marker.followButton = followButton;
|
||||
followButton.className = 'followButton';
|
||||
followButton.onclick = function(e) {
|
||||
plfollow(mi.id != followPlayer ? mi.id : '');
|
||||
};
|
||||
playerRow.appendChild(followButton);
|
||||
|
||||
var playerIconContainer = document.createElement('span');
|
||||
playerRow.appendChild(playerIconContainer);
|
||||
marker.playerRow = $('<div/>')
|
||||
.attr({ id: 'playerrow_' + mi.text })
|
||||
.addClass('playerrow')
|
||||
.append(marker.followButton = $('<input/>')
|
||||
.attr({ type: 'checkbox',
|
||||
name: 'followPlayer',
|
||||
checked: false,
|
||||
value: mi.text
|
||||
})
|
||||
.addClass('followButton')
|
||||
.click(function(e) {
|
||||
plfollow(mi.id != followPlayer ? mi.id : '');
|
||||
}))
|
||||
.append(marker.playerIconContainer = $('<span/>'))
|
||||
.append($('<a/>')
|
||||
.text(mi.text)
|
||||
.attr({ href: '#' })
|
||||
.click(function(e) { map.panTo(markers[mi.id].getPosition()); })
|
||||
);
|
||||
|
||||
getMinecraftHead(mi.text, 16, function(head) {
|
||||
head.className = 'playerIcon';
|
||||
playerRow.icon = head;
|
||||
playerIconContainer.appendChild(head);
|
||||
marker.playerRow.icon = $(head)
|
||||
.addClass('playerIcon')
|
||||
.appendTo(marker.playerIconContainer);
|
||||
});
|
||||
var playerText = document.createElement('a');
|
||||
playerText.appendChild(document.createTextNode(mi.text));
|
||||
playerText.href = '#';
|
||||
playerText.onclick = function(e) { map.panTo(markers[mi.id].getPosition()); };
|
||||
playerRow.appendChild(playerText);
|
||||
|
||||
marker.playerRow = playerRow;
|
||||
var playerlst = document.getElementById('playerlst');
|
||||
playerlst.appendChild(playerRow);
|
||||
$('#playerlst').append(marker.playerRow);
|
||||
}
|
||||
}
|
||||
|
||||
@ -323,21 +324,23 @@ function makeRequest(url, func, type, fail, post, contenttype)
|
||||
}
|
||||
|
||||
var time = {
|
||||
hours: parseInt(servertime / 1000),
|
||||
// Assuming it is day at 8:00
|
||||
hours: (parseInt(servertime / 1000)+8) % 24,
|
||||
minutes: parseInt(((servertime / 1000) % 1) * 60),
|
||||
seconds: parseInt(((((servertime / 1000) % 1) * 60) % 1) * 60)
|
||||
};
|
||||
|
||||
|
||||
var clock = document.getElementById('clock');
|
||||
clock.className = (servertime > 12000 ? 'night' : 'day');
|
||||
clock.innerText = formatTime(time);
|
||||
$('#clock')
|
||||
.addClass(servertime > 12000 ? 'night' : 'day')
|
||||
.removeClass(servertime > 12000 ? 'day' : 'night')
|
||||
.text(formatTime(time));
|
||||
|
||||
for(var m in markers) {
|
||||
if(!(m in loggedin)) {
|
||||
markers[m].remove(null);
|
||||
if (markers[m].markerType == 'player') {
|
||||
playerlst.removeChild(markers[m].playerRow);
|
||||
if (markers[m].playerRow) {
|
||||
markers[m].playerRow.remove();
|
||||
}
|
||||
delete markers[m];
|
||||
}
|
||||
|
@ -7,14 +7,14 @@ var cloneCanvas = function(self) {
|
||||
return c;
|
||||
};
|
||||
|
||||
CanvasRenderingContext2D.prototype.blitImage = function(image, sx ,sy, sw, sh, dx, dy, dw, dh) {
|
||||
function blitImage(ctx, image, sx ,sy, sw, sh, dx, dy, dw, dh) {
|
||||
var x; var y;
|
||||
for (x=0;x<dw;x++) {
|
||||
for (y=0;y<dh;y++) {
|
||||
this.drawImage(image,Math.floor(sx+x*(sw/dw)),Math.floor(sy+y*(sw/dw)),1,1,dx+x,dy+y,1,1);
|
||||
ctx.drawImage(image,Math.floor(sx+x*(sw/dw)),Math.floor(sy+y*(sw/dw)),1,1,dx+x,dy+y,1,1);
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function createMinecraftHead(player,completed) {
|
||||
var skinImage = new Image();
|
||||
@ -23,8 +23,8 @@ function createMinecraftHead(player,completed) {
|
||||
headCanvas.width = 8;
|
||||
headCanvas.height = 8;
|
||||
var headContext = headCanvas.getContext('2d');
|
||||
headContext.blitImage(skinImage, 8,8,8,8, 0,0,8,8);
|
||||
headContext.blitImage(skinImage, 40,8,8,8, 0,0,8,8);
|
||||
blitImage(headContext, skinImage, 8,8,8,8, 0,0,8,8);
|
||||
blitImage(headContext, skinImage, 40,8,8,8, 0,0,8,8);
|
||||
completed(headCanvas);
|
||||
};
|
||||
skinImage.src = 'http://www.minecraft.net/skin/' + player + '.png';
|
||||
@ -35,14 +35,14 @@ function resizeImage(img,size) {
|
||||
canvas.width = size;
|
||||
canvas.height = size;
|
||||
var ctx = canvas.getContext('2d');
|
||||
ctx.blitImage(img, 0,0,img.width,img.height, 0,0,size,size);
|
||||
blitImage(ctx, img, 0,0,img.width,img.height, 0,0,size,size);
|
||||
return canvas;
|
||||
}
|
||||
|
||||
var players = {};
|
||||
var playerHeads = {};
|
||||
|
||||
function getMinecraftHead(player,size,completed) {
|
||||
var head = players[player];
|
||||
var head = playerHeads[player];
|
||||
// Synchronous
|
||||
if (!completed) {
|
||||
return (!head || head.working) ? null : head;
|
||||
@ -50,12 +50,12 @@ function getMinecraftHead(player,size,completed) {
|
||||
|
||||
// Asynchronous
|
||||
if (!head) {
|
||||
players[player] = { working: true, hooks: [{f:completed,s:size}] };
|
||||
playerHeads[player] = { working: true, hooks: [{f:completed,s:size}] };
|
||||
console.log('Creating head for ',player,'...');
|
||||
createMinecraftHead(player, function(head) {
|
||||
console.log('Created head for ',player,': ', head);
|
||||
hooks = players[player].hooks;
|
||||
players[player] = head;
|
||||
hooks = playerHeads[player].hooks;
|
||||
playerHeads[player] = head;
|
||||
var i;
|
||||
for(i=0;i<hooks.length;i++) {
|
||||
hooks[i].f(resizeImage(head,hooks[i].s));
|
||||
|
Loading…
Reference in New Issue
Block a user