cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/3711'

Browse source
This commit is contained in:
Tom Hughes 2022-09-22 18:02:46 +01:00
commit 19a014bde6
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/assets/javascripts/leaflet.map.js
View file

@ -300,12 +300,17 @@ L.OSM.Map = L.Map.extend({
},
setSidebarOverlaid: function (overlaid) {
var sidebarWidth = 350;
if (overlaid && !$("#content").hasClass("overlay-sidebar")) {
$("#content").addClass("overlay-sidebar");
this.invalidateSize({ pan: false })
.panBy([-350, 0], { animate: false });
this.invalidateSize({ pan: false });
if ($("html").attr("dir") !== "rtl") {
this.panBy([-sidebarWidth, 0], { animate: false });
}
} else if (!overlaid && $("#content").hasClass("overlay-sidebar")) {
this.panBy([350, 0], { animate: false });
if ($("html").attr("dir") !== "rtl") {
this.panBy([sidebarWidth, 0], { animate: false });
}
$("#content").removeClass("overlay-sidebar");
this.invalidateSize({ pan: false });
}

8
app/assets/javascripts/leaflet.sidebar.js
View file

@ -17,6 +17,8 @@ L.OSM.sidebar = function (selector) {
};
control.togglePane = function (pane, button) {
var paneWidth = 250;
current
.hide()
.trigger("hide");
@ -25,12 +27,18 @@ L.OSM.sidebar = function (selector) {
.removeClass("active");
if (current === pane) {
if ($("html").attr("dir") === "rtl") {
map.panBy([-paneWidth, 0], { animate: false });
}
$(sidebar).hide();
current = currentButton = $();
} else {
$(sidebar).show();
current = pane;
currentButton = button || $();
if ($("html").attr("dir") === "rtl") {
map.panBy([paneWidth, 0], { animate: false });
}
}
map.invalidateSize({ pan: false, animate: false });