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 #358 from mikeprimm/master

Browse Source 
Fix background color support, fix junk on map switches
This commit is contained in:
mikeprimm 2011-08-01 22:08:23 -07:00
commit 49978e3ac5
5 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
web/images/blank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 167 B

3
web/js/flatmap.js
View File

@ -10,7 +10,8 @@ var FlatProjection = DynmapProjection.extend({
var FlatMapType = DynmapTileLayer.extend({
options: {
minZoom: 0,
maxZoom: 4
maxZoom: 4,
errorTileUrl: 'images/blank.png'
},
initialize: function(options) {
options.maxzoomout = options.mapzoomout || options.world.extrazoomout;

3
web/js/hdmap.js
View File

@ -14,7 +14,8 @@ var HDMapType = DynmapTileLayer.extend({
projection: undefined,
options: {
minZoom: 0,
maxZoom: 0
maxZoom: 0,
errorTileUrl: 'images/blank.png'
},
initialize: function(options) {
options.maxZoom = options.mapzoomin + options.mapzoomout;

3
web/js/kzedmaps.js
View File

@ -16,7 +16,8 @@ var KzedProjection = DynmapProjection.extend({
var KzedMapType = DynmapTileLayer.extend({
options: {
minZoom: 0,
maxZoom: 4
maxZoom: 4,
errorTileUrl: 'images/blank.png'
},
initialize: function(options) {
options.mapzoomout = options.mapzoomout || options.world.extrazoomout;

17
web/js/map.js
View File

@ -599,18 +599,19 @@ DynMap.prototype = {
var me = this;
var col = "#000000";
if(me.serverday) {
if(me.maptype.backgroundday)
col = me.maptype.backgroundday;
else if(me.maptype.background)
col = me.maptype.background;
if(me.maptype.options.backgroundday)
col = me.maptype.options.backgroundday;
else if(me.maptype.options.background)
col = me.maptype.options.background;
}
else {
if(me.maptype.backgroundnight)
col = me.maptype.backgroundnight;
else if(me.maptype.background)
col = me.maptype.background;
if(me.maptype.options.backgroundnight)
col = me.maptype.options.backgroundnight;
else if(me.maptype.options.background)
col = me.maptype.options.background;
}
$('.map').css('background', col);
$('.leaflet-tile').css('background', col);
},
getParameterByName: function(name) {
name = name.replace(/[\[]/,"\\\[").replace(/[\]]/,"\\\]");