Minor cleaups.
This commit is contained in:
parent
27fb8a20f1
commit
d634aede92
2 changed files with 218 additions and 253 deletions
|
|
@ -23,9 +23,9 @@
|
|||
<div id="mcmap"></div>
|
||||
<div id="alert">Updating...</div>
|
||||
<div id="plist">
|
||||
<img id="plistbtn" alt="on" src="list_on.png" onclick="plistopen()" title="Toggle Player List" />
|
||||
<div id="maplist"></div>
|
||||
<input type="checkbox" onclick="$('#lst').toggle()" title="Toggle Player List" checked="checked"/>
|
||||
<div id="lst">
|
||||
<div id="maplist"></div>
|
||||
<div id="playerlst"></div>
|
||||
<div id="clock"></div>
|
||||
</div>
|
||||
|
|
|
|||
49
web/map.js
49
web/map.js
|
|
@ -87,11 +87,7 @@ function onTileUpdated(tileName) {
|
|||
var clock = null;
|
||||
var markers = new Array();
|
||||
var lasttimestamp = '0';
|
||||
var followPlayer = '';
|
||||
|
||||
var lst;
|
||||
var plistbtn;
|
||||
var lstopen = true;
|
||||
var followingPlayer = '';
|
||||
|
||||
function updateMarker(mi) {
|
||||
if(mi.id in markers) {
|
||||
|
|
@ -104,7 +100,6 @@ var clock = null;
|
|||
m.show();
|
||||
}
|
||||
|
||||
var converted = mi.position;
|
||||
m.setPosition(mi.position);
|
||||
} else {
|
||||
var contentfun = function(div,mi) {
|
||||
|
|
@ -147,7 +142,7 @@ var clock = null;
|
|||
})
|
||||
.addClass('followButton')
|
||||
.click(function(e) {
|
||||
plfollow(mi.id != followPlayer ? mi.id : '');
|
||||
followPlayer(mi.id != followingPlayer ? mi.id : '');
|
||||
}))
|
||||
.append(marker.playerIconContainer = $('<span/>'))
|
||||
.append($('<a/>')
|
||||
|
|
@ -166,7 +161,7 @@ var clock = null;
|
|||
}
|
||||
}
|
||||
|
||||
if(mi.id == followPlayer) {
|
||||
if(mi.id == followingPlayer) {
|
||||
map.panTo(markers[mi.id].getPosition());
|
||||
}
|
||||
}
|
||||
|
|
@ -245,9 +240,6 @@ var clock = null;
|
|||
}
|
||||
|
||||
window.onload = function initialize() {
|
||||
lst = document.getElementById('lst');
|
||||
plistbtn = document.getElementById('plistbtn');
|
||||
|
||||
var mapOptions = {
|
||||
zoom: 1,
|
||||
center: new google.maps.LatLng(0, 1),
|
||||
|
|
@ -263,7 +255,7 @@ var clock = null;
|
|||
map = new google.maps.Map(document.getElementById("mcmap"), mapOptions);
|
||||
|
||||
google.maps.event.addListener(map, 'dragstart', function(mEvent) {
|
||||
plfollow('');
|
||||
followPlayer('');
|
||||
});
|
||||
google.maps.event.addListener(map, 'zoom_changed', function() {
|
||||
makeLink();
|
||||
|
|
@ -271,7 +263,7 @@ var clock = null;
|
|||
google.maps.event.addListener(map, 'center_changed', function() {
|
||||
makeLink();
|
||||
});
|
||||
map.dragstart = plfollow('');
|
||||
map.dragstart = followPlayer('');
|
||||
|
||||
$.each(config.maps, function(name, mapType){
|
||||
map.mapTypes.set(name, mapType);
|
||||
|
|
@ -307,21 +299,7 @@ var clock = null;
|
|||
setTimeout(mapUpdate, config.updateRate);
|
||||
}
|
||||
|
||||
function plistopen() {
|
||||
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) {
|
||||
function followPlayer(name) {
|
||||
$('.followButton').removeAttr('checked');
|
||||
|
||||
if(name in markers) {
|
||||
|
|
@ -329,7 +307,7 @@ var clock = null;
|
|||
$(m.followButton).attr('checked', 'checked');
|
||||
map.panTo(m.getPosition());
|
||||
}
|
||||
followPlayer = name;
|
||||
followingPlayer = name;
|
||||
}
|
||||
|
||||
function makeLink() {
|
||||
|
|
@ -339,16 +317,3 @@ var clock = null;
|
|||
+ "&zoom=" + map.getZoom();
|
||||
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;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue