fixup small border tweaks for ui worldmap
This commit is contained in:
parent
cfb9f7feda
commit
6edac99bd3
@ -389,7 +389,7 @@ then by default <code>⌘⇧m</code> - <code>ctrl-shift-m</code> will load the m
|
||||
panit: {value:"false"},
|
||||
panlock: {value:"false"},
|
||||
zoomlock: {value:"false"},
|
||||
hiderightclick: {value:"false"},
|
||||
hiderightclick: {value:"true"},
|
||||
coords: {value:"false"},
|
||||
showgrid: {value:"false"},
|
||||
path: {value:"/worldmap"}
|
||||
|
18
worldmap.js
18
worldmap.js
@ -124,26 +124,20 @@ module.exports = function(RED) {
|
||||
}
|
||||
RED.nodes.registerType("worldmap",WorldMap);
|
||||
|
||||
|
||||
function HTML(ui, config) {
|
||||
var width = config.width;
|
||||
if (width == 0) {
|
||||
var group = RED.nodes.getNode(config.group);
|
||||
if (group) {
|
||||
width = group.config.width;
|
||||
}
|
||||
if (group) { width = group.config.width; }
|
||||
}
|
||||
var height = config.height;
|
||||
if (height == 0) {
|
||||
height = 10;
|
||||
}
|
||||
if (height == 0) { height = 10; }
|
||||
var size = ui.getSizes();
|
||||
var frameWidth = (size.sx +size.cx) *width -size.cx -10;
|
||||
var frameHeight = (size.sy +size.cy) *height -size.cy -10;
|
||||
var frameWidth = (size.sx +size.cx) *width - size.cx - 1;
|
||||
var frameHeight = (size.sy +size.cy) *height - size.cy - 2;
|
||||
var url = encodeURI(config.path);
|
||||
var html = `
|
||||
<div>
|
||||
<iframe src="${url}" width="${frameWidth}px" height="${frameHeight}px" style="border: none;"></iframe>
|
||||
var html = `<div style="overflow:hidden;">
|
||||
<iframe src="${url}" width="${frameWidth}px" height="${frameHeight}px" style="border:none;"></iframe>
|
||||
</div>
|
||||
`;
|
||||
return html;
|
||||
|
@ -266,9 +266,11 @@ function doLock(v) {
|
||||
if (v !== undefined) { lockit = v; }
|
||||
if (lockit === false) {
|
||||
mb = new L.LatLngBounds([[-120,-360],[120,360]]);
|
||||
map.dragging.enable();
|
||||
}
|
||||
else {
|
||||
mb = map.getBounds();
|
||||
map.dragging.disable();
|
||||
window.localStorage.setItem("lastpos",JSON.stringify(map.getCenter()));
|
||||
window.localStorage.setItem("lastzoom", map.getZoom());
|
||||
window.localStorage.setItem("lastlayer", baselayername);
|
||||
|
Loading…
Reference in New Issue
Block a user