Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-17 20:31:37 +01:00
Code Issues Projects Releases Wiki Activity

Add 'pinned' choice for showlayercontrol: setting - show expanded layer control

Browse Source
This commit is contained in:
Mike Primm 2011-12-31 08:26:55 +08:00 committed by mikeprimm
parent dc7efc2642
commit 514e96605b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ public class ClientConfigurationComponent extends Component {
s(t, "sidebaropened", c.getString("sidebaropened", "false")); s(t, "sidebaropened", c.getString("sidebaropened", "false"));
s(t, "dynmapversion", plugin.getDescription().getVersion()); s(t, "dynmapversion", plugin.getDescription().getVersion());
s(t, "cyrillic", c.getBoolean("cyrillic-support", false)); s(t, "cyrillic", c.getBoolean("cyrillic-support", false));
s(t, "showlayercontrol", c.getBoolean("showlayercontrol", true)); s(t, "showlayercontrol", c.getString("showlayercontrol", "true"));
s(t, "grayplayerswhenhidden", c.getBoolean("grayplayerswhenhidden", true)); s(t, "grayplayerswhenhidden", c.getBoolean("grayplayerswhenhidden", true));
String sn = plugin.getServer().getServerName(); String sn = plugin.getServer().getServerName();
if(sn.equals("Unknown Server")) if(sn.equals("Unknown Server"))

8
web/js/map.js
View File

@ -109,8 +109,8 @@ DynMap.prototype = {
if(urlzoom != null) if(urlzoom != null)
me.options.defaultzoom = urlzoom; me.options.defaultzoom = urlzoom;
var showlayerctl = me.getBoolParameterByName('showlayercontrol'); var showlayerctl = me.getParameterByName('showlayercontrol');
if(showlayerctl != null) if(showlayerctl != "")
me.options.showlayercontrol = showlayerctl; me.options.showlayercontrol = showlayerctl;
if(typeof me.options.defaultzoom == 'undefined') if(typeof me.options.defaultzoom == 'undefined')
@ -786,8 +786,10 @@ DynMap.prototype = {
addToLayerSelector: function(layer, name, priority) { addToLayerSelector: function(layer, name, priority) {
var me = this; var me = this;
if(me.options.showlayercontrol && (!me.layercontrol)) { if(me.options.showlayercontrol != "false" && (!me.layercontrol)) {
me.layercontrol = new DynmapLayerControl(); me.layercontrol = new DynmapLayerControl();
if(me.options.showlayercontrol == "pinned")
me.layercontrol.options.collapsed = false;
map.addControl(me.layercontrol); map.addControl(me.layercontrol);
} }