Skip to content

Shorten cookie expiry assignment #6596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tomhughes merged 1 commit into from
Dec 8, 2025
Merged

Shorten cookie expiry assignment #6596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/assets/javascripts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ $(function () {

$(".leaflet-control .control-button").tooltip({ placement: "left", container: "body" });

const expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
const expires = new Date();
const thisYear = expires.getFullYear();
expires.setFullYear(thisYear + 10);

map.on("moveend baselayerchange overlayadd overlayremove", function () {
updateLinks(
Expand All @@ -172,7 +173,7 @@ $(function () {
map.getLayersCode(),
map._object);

OSM.cookies.set("_osm_location", OSM.locationCookie(map), { expires: expiry });
OSM.cookies.set("_osm_location", OSM.locationCookie(map), { expires });
});

if (OSM.cookies.get("_osm_welcome") !== "hide") {
Expand All @@ -181,18 +182,17 @@ $(function () {

$(".welcome .btn-close").on("click", function () {
$(".welcome").hide();
OSM.cookies.set("_osm_welcome", "hide", { expires: expiry });
OSM.cookies.set("_osm_welcome", "hide", { expires });
});

const bannerExpiry = new Date();
bannerExpiry.setYear(bannerExpiry.getFullYear() + 1);
expires.setFullYear(thisYear + 1);

$("#banner .btn-close").on("click", function (e) {
const cookieId = e.target.id;
$("#banner").hide();
e.preventDefault();
if (cookieId) {
OSM.cookies.set(cookieId, "hide", { expires: bannerExpiry });
OSM.cookies.set(cookieId, "hide", { expires });
}
});

Expand Down
8 changes: 4 additions & 4 deletions app/assets/javascripts/index/directions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ OSM.Directions = function (map) {
OSM.DirectionsEndpoint(map, $("input[name='route_to']"), { icon: "stop", color: "var(--marker-red)" }, endpointDragCallback, endpointChangeCallback)
];

const expiry = new Date();
expiry.setYear(expiry.getFullYear() + 10);
const expires = new Date();
expires.setFullYear(expires.getFullYear() + 10);

const modeGroup = $(".routing_modes");
const select = $("select#routing_engines");
Expand Down Expand Up @@ -140,13 +140,13 @@ OSM.Directions = function (map) {

modeGroup.on("change", "input[name='modes']", function (e) {
setEngine(chosenEngine.provider + "_" + e.target.value);
OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires: expiry });
OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires });
getRoute(true, true);
});

select.on("change", function (e) {
setEngine(e.target.value + "_" + chosenEngine.mode);
OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires: expiry });
OSM.cookies.set("_osm_directions_engine", chosenEngine.id, { expires });
getRoute(true, true);
});

Expand Down