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

Merge pull request #192 from mikeprimm/master

Browse source 
Replace "?0" in default image URLs with "?<currenttimemillis>" to prevent browser cache issues
This commit is contained in:
mikeprimm 2011-06-02 11:20:51 -07:00
commit fe8bb1868e
1 changed files with 44 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

87
web/js/map.js
View file

@ -93,6 +93,7 @@ DynMap.prototype = {
lasttimestamp: '0', lasttimestamp: '0',
servertime: 0, servertime: 0,
serverday: false, serverday: false,
inittime: new Date().getTime(),
followingPlayer: '', followingPlayer: '',
formatUrl: function(name, options) { formatUrl: function(name, options) {
var url = this.options.url[name]; var url = this.options.url[name];
@ -165,35 +166,35 @@ DynMap.prototype = {
*/ */
// Sidebar // Sidebar
var panel; var panel;
var sidebar; var sidebar;
var pinbutton; var pinbutton;
if(!me.options.sidebaropened) { if(!me.options.sidebaropened) {
sidebar = me.sidebar = $('<div/>') sidebar = me.sidebar = $('<div/>')
.addClass('sidebar') .addClass('sidebar')
.appendTo(container); .appendTo(container);
panel = $('<div/>')
.addClass('panel')
.appendTo(sidebar);
panel = $('<div/>') // Pin button.
.addClass('panel') pinbutton = $('<div/>')
.appendTo(sidebar); .addClass('pin')
.click(function() {
// Pin button. sidebar.toggleClass('pinned');
pinbutton = $('<div/>') })
.addClass('pin') .appendTo(panel);
.click(function() { }
sidebar.toggleClass('pinned'); else {
}) sidebar = me.sidebar = $('<div/>')
.appendTo(panel); .addClass('sidebar pinned')
.appendTo(container);
panel = $('<div/>')
.addClass('panel')
.appendTo(sidebar);
} }
else {
sidebar = me.sidebar = $('<div/>')
.addClass('sidebar pinned')
.appendTo(container);
panel = $('<div/>')
.addClass('panel')
.appendTo(sidebar);
}
// Worlds // Worlds
var worldlist; var worldlist;
@ -387,12 +388,12 @@ DynMap.prototype = {
me.lasttimestamp = update.timestamp; me.lasttimestamp = update.timestamp;
} }
me.servertime = update.servertime; me.servertime = update.servertime;
var oldday = me.serverday; var oldday = me.serverday;
if(me.servertime > 23100 || me.servertime < 12900) if(me.servertime > 23100 || me.servertime < 12900)
me.serverday = true; me.serverday = true;
else else
me.serverday = false; me.serverday = false;
var newplayers = {}; var newplayers = {};
$.each(update.players, function(index, playerUpdate) { $.each(update.players, function(index, playerUpdate) {
@ -436,15 +437,15 @@ DynMap.prototype = {
//divs.filter(function(i){return parseInt(divs[i].attr('rel')) > timestamp+me.options.messagettl;}).remove(); //divs.filter(function(i){return parseInt(divs[i].attr('rel')) > timestamp+me.options.messagettl;}).remove();
}); });
if(me.serverday != oldday) { if(me.serverday != oldday) {
var mtid = me.map.mapTypeId; var mtid = me.map.mapTypeId;
if(me.map.mapTypes[mtid].nightandday) { if(me.map.mapTypes[mtid].nightandday) {
me.map.setMapTypeId('none'); me.map.setMapTypeId('none');
window.setTimeout(function() { window.setTimeout(function() {
me.map.setMapTypeId(mtid); me.map.setMapTypeId(mtid);
}, 1); }, 1);
} }
} }
$(me).trigger('worldupdated', [ update ]); $(me).trigger('worldupdated', [ update ]);
@ -467,7 +468,7 @@ DynMap.prototype = {
if(tile) { if(tile) {
return me.options.tileUrl + me.world.name + '/' + tileName + '?' + tile.lastseen; return me.options.tileUrl + me.world.name + '/' + tileName + '?' + tile.lastseen;
} else { } else {
return me.options.tileUrl + me.world.name + '/' + tileName + '?0'; return me.options.tileUrl + me.world.name + '/' + tileName + '?' + me.inittime; /* Browser cache fix on reload */
} }
}, },
registerTile: function(mapType, tileName, tile) { registerTile: function(mapType, tileName, tile) {