Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 13:15:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #175 from mikeprimm/master

Browse Source 
Add 'sidebaropened' option flat, to allow menu sidebar to be always opened
This commit is contained in:
mikeprimm 2011-05-30 07:58:35 -07:00
commit d40bdf4638
3 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configuration.txt
View File

@ -95,6 +95,9 @@ updaterate: 2000
showplayerfacesinmenu: true
# Set sidebaropened: true to pin menu sidebar opened
#sidebaropened: true
joinmessage: "%playername% joined"
quitmessage: "%playername% quit"
spammessage: "You may only chat once every %interval% seconds."

1
src/main/java/org/dynmap/ClientConfigurationComponent.java
View File

@ -20,6 +20,7 @@ public class ClientConfigurationComponent extends Component {
s(t, "quitmessage", c.getString("quitmessage", "%playername% quit"));
s(t, "spammessage", c.getString("spammessage", "You may only chat once every %interval% seconds."));
s(t, "defaultzoom", c.getInteger("defaultzoom", 0));
s(t, "sidebaropened", c.getBoolean("sidebaropened", false));
DynmapWorld defaultWorld = null;
for(DynmapWorld world : plugin.mapManager.getWorlds()) {

74
web/js/map.js
View File

@ -165,22 +165,36 @@ DynMap.prototype = {
*/
// Sidebar
var sidebar = me.sidebar = $('<div/>')
.addClass('sidebar')
.appendTo(container);
var panel;
var sidebar;
var pinbutton;
if(!me.options.sidebaropened) {
sidebar = me.sidebar = $('<div/>')
.addClass('sidebar')
.appendTo(container);
var panel = $('<div/>')
.addClass('panel')
.appendTo(sidebar);
panel = $('<div/>')
.addClass('panel')
.appendTo(sidebar);
// Pin button.
var pinbutton = $('<div/>')
.addClass('pin')
.click(function() {
sidebar.toggleClass('pinned');
})
.appendTo(panel);
// Pin button.
pinbutton = $('<div/>')
.addClass('pin')
.click(function() {
sidebar.toggleClass('pinned');
})
.appendTo(panel);
}
else {
sidebar = me.sidebar = $('<div/>')
.addClass('sidebar pinned')
.appendTo(container);
panel = $('<div/>')
.addClass('panel')
.appendTo(sidebar);
}
// Worlds
var worldlist;
$('<fieldset/>')
@ -275,11 +289,12 @@ DynMap.prototype = {
.append(link=$('<input type="text" />'))
.data('link', link)
.appendTo(container);*/
$('<div/>')
.addClass('hitbar')
.appendTo(panel);
if(!me.options.sidebaropened) {
$('<div/>')
.addClass('hitbar')
.appendTo(panel);
}
var alertbox = me.alertbox = $('<div/>')
.addClass('alertbox')
.hide()
@ -371,22 +386,13 @@ DynMap.prototype = {
if (!me.options.jsonfile) {
me.lasttimestamp = update.timestamp;
}
me.servertime = update.servertime;
me.servertime = update.servertime;
var oldday = me.serverday;
if(me.servertime > 23100 || me.servertime < 12900)
me.serverday = true;
else
me.serverday = false;
if(me.serverday != oldday) {
var mtid = me.map.mapTypeId;
if(me.map.mapTypes[mtid].nightandday) {
me.map.setMapTypeId('none');
window.setTimeout(function() {
me.map.setMapTypeId(mtid);
}, 1);
}
}
var newplayers = {};
$.each(update.players, function(index, playerUpdate) {
@ -429,6 +435,16 @@ DynMap.prototype = {
//var divs = $('div[rel]');
//divs.filter(function(i){return parseInt(divs[i].attr('rel')) > timestamp+me.options.messagettl;}).remove();
});
if(me.serverday != oldday) {
var mtid = me.map.mapTypeId;
if(me.map.mapTypes[mtid].nightandday) {
me.map.setMapTypeId('none');
window.setTimeout(function() {
me.map.setMapTypeId(mtid);
}, 1);
}
}
$(me).trigger('worldupdated', [ update ]);