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

Minor cleaups.

Browse source
This commit is contained in:
FrozenCow 2011-01-12 01:45:56 +01:00
parent 27fb8a20f1
commit d634aede92
2 changed files with 218 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/index.html
View file

@ -23,9 +23,9 @@
<div id="mcmap"></div> <div id="mcmap"></div>
<div id="alert">Updating...</div> <div id="alert">Updating...</div>
<div id="plist"> <div id="plist">
<img id="plistbtn" alt="on" src="list_on.png" onclick="plistopen()" title="Toggle Player List" /> <input type="checkbox" onclick="$('#lst').toggle()" title="Toggle Player List" checked="checked"/>
<div id="maplist"></div>
<div id="lst"> <div id="lst">
<div id="maplist"></div>
<div id="playerlst"></div> <div id="playerlst"></div>
<div id="clock"></div> <div id="clock"></div>
</div> </div>

73
web/map.js
View file

@ -85,15 +85,11 @@ function onTileUpdated(tileName) {
} }
var clock = null; var clock = null;
var markers = new Array(); var markers = new Array();
var lasttimestamp = '0'; var lasttimestamp = '0';
var followPlayer = ''; var followingPlayer = '';
var lst; function updateMarker(mi) {
var plistbtn;
var lstopen = true;
function updateMarker(mi) {
if(mi.id in markers) { if(mi.id in markers) {
var m = markers[mi.id]; var m = markers[mi.id];
if (!mi.visible) { if (!mi.visible) {
@ -104,7 +100,6 @@ var clock = null;
m.show(); m.show();
} }
var converted = mi.position;
m.setPosition(mi.position); m.setPosition(mi.position);
} else { } else {
var contentfun = function(div,mi) { var contentfun = function(div,mi) {
@ -147,7 +142,7 @@ var clock = null;
}) })
.addClass('followButton') .addClass('followButton')
.click(function(e) { .click(function(e) {
plfollow(mi.id != followPlayer ? mi.id : ''); followPlayer(mi.id != followingPlayer ? mi.id : '');
})) }))
.append(marker.playerIconContainer = $('<span/>')) .append(marker.playerIconContainer = $('<span/>'))
.append($('<a/>') .append($('<a/>')
@ -166,13 +161,13 @@ var clock = null;
} }
} }
if(mi.id == followPlayer) { if(mi.id == followingPlayer) {
map.panTo(markers[mi.id].getPosition()); map.panTo(markers[mi.id].getPosition());
} }
} }
function mapUpdate() function mapUpdate()
{ {
$.ajax({ $.ajax({
url: config.updateUrl + lasttimestamp, url: config.updateUrl + lasttimestamp,
success: function(res) { success: function(res) {
@ -242,12 +237,9 @@ var clock = null;
setTimeout(mapUpdate, config.updateRate); setTimeout(mapUpdate, config.updateRate);
} }
}); });
} }
window.onload = function initialize() {
lst = document.getElementById('lst');
plistbtn = document.getElementById('plistbtn');
window.onload = function initialize() {
var mapOptions = { var mapOptions = {
zoom: 1, zoom: 1,
center: new google.maps.LatLng(0, 1), center: new google.maps.LatLng(0, 1),
@ -263,7 +255,7 @@ var clock = null;
map = new google.maps.Map(document.getElementById("mcmap"), mapOptions); map = new google.maps.Map(document.getElementById("mcmap"), mapOptions);
google.maps.event.addListener(map, 'dragstart', function(mEvent) { google.maps.event.addListener(map, 'dragstart', function(mEvent) {
plfollow(''); followPlayer('');
}); });
google.maps.event.addListener(map, 'zoom_changed', function() { google.maps.event.addListener(map, 'zoom_changed', function() {
makeLink(); makeLink();
@ -271,7 +263,7 @@ var clock = null;
google.maps.event.addListener(map, 'center_changed', function() { google.maps.event.addListener(map, 'center_changed', function() {
makeLink(); makeLink();
}); });
map.dragstart = plfollow(''); map.dragstart = followPlayer('');
$.each(config.maps, function(name, mapType){ $.each(config.maps, function(name, mapType){
map.mapTypes.set(name, mapType); map.mapTypes.set(name, mapType);
@ -305,23 +297,9 @@ var clock = null;
clock = new MinecraftClock($('#clock')); clock = new MinecraftClock($('#clock'));
setTimeout(mapUpdate, config.updateRate); setTimeout(mapUpdate, config.updateRate);
} }
function plistopen() { function followPlayer(name) {
if(lstopen) {
lstopen = false;
lst.style.display = 'none';
lst.style.visibility = 'hidden';
plistbtn.src = 'list_off.png';
} else {
lstopen = true;
lst.style.display = '';
lst.style.visibility = '';
plistbtn.src = 'list_on.png';
}
}
function plfollow(name) {
$('.followButton').removeAttr('checked'); $('.followButton').removeAttr('checked');
if(name in markers) { if(name in markers) {
@ -329,26 +307,13 @@ var clock = null;
$(m.followButton).attr('checked', 'checked'); $(m.followButton).attr('checked', 'checked');
map.panTo(m.getPosition()); map.panTo(m.getPosition());
} }
followPlayer = name; followingPlayer = name;
} }
function makeLink() { function makeLink() {
var a=location.href.substring(0,location.href.lastIndexOf("/")+1) var a=location.href.substring(0,location.href.lastIndexOf("/")+1)
+ "?lat=" + map.getCenter().lat().toFixed(6) + "?lat=" + map.getCenter().lat().toFixed(6)
+ "&lng=" + map.getCenter().lng().toFixed(6) + "&lng=" + map.getCenter().lng().toFixed(6)
+ "&zoom=" + map.getZoom(); + "&zoom=" + map.getZoom();
document.getElementById("link").innerHTML = a; document.getElementById("link").innerHTML = a;
} }
//remove item (string or number) from an array
function removeItem(originalArray, itemToRemove) {
var j = 0;
while (j < originalArray.length) {
// alert(originalArray[j]);
if (originalArray[j] == itemToRemove) {
originalArray.splice(j, 1);
} else { j++; }
}
// assert('hi');
return originalArray;
}