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

Replace uses of var with let or const as appropriate

Browse source
This commit is contained in:
Tom Hughes 2025-01-26 19:06:27 +00:00
parent f83424aeb2
commit c47cb299a8
36 changed files with 427 additions and 430 deletions
Download patch file Download diff file Expand all files Collapse all files

38
app/assets/javascripts/router.js
View file

@ -47,13 +47,13 @@
move the map without the hash changing.
*/
OSM.Router = function (map, rts) {
var escapeRegExp = /[-{}[\]+?.,\\^$|#\s]/g;
var optionalParam = /\((.*?)\)/g;
var namedParam = /(\(\?)?:\w+/g;
var splatParam = /\*\w+/g;
const escapeRegExp = /[-{}[\]+?.,\\^$|#\s]/g;
const optionalParam = /\((.*?)\)/g;
const namedParam = /(\(\?)?:\w+/g;
const splatParam = /\*\w+/g;
function Route(path, controller) {
var regexp = new RegExp("^" +
const regexp = new RegExp("^" +
path.replace(escapeRegExp, "\\$&")
.replace(optionalParam, "(?:$1)?")
.replace(namedParam, function (match, optional) {
@ -61,14 +61,14 @@ OSM.Router = function (map, rts) {
})
.replace(splatParam, "(.*?)") + "(?:\\?.*)?$");
var route = {};
const route = {};
route.match = function (path) {
return regexp.test(path);
};
route.run = function (action, path) {
var params = [];
let params = [];
if (path) {
params = regexp.exec(path).map(function (param, i) {
@ -93,15 +93,15 @@ OSM.Router = function (map, rts) {
}
};
var currentPath = window.location.pathname.replace(/(.)\/$/, "$1") + window.location.search,
let currentPath = window.location.pathname.replace(/(.)\/$/, "$1") + window.location.search,
currentRoute = routes.recognize(currentPath),
currentHash = location.hash || OSM.formatHash(map);
var router = {};
const router = {};
function updateSecondaryNav() {
$("header nav.secondary > ul > li > a").each(function () {
var active = $(this).attr("href") === window.location.pathname;
const active = $(this).attr("href") === window.location.pathname;
$(this)
.toggleClass("text-secondary", !active)
@ -111,8 +111,8 @@ OSM.Router = function (map, rts) {
$(window).on("popstate", function (e) {
if (!e.originalEvent.state) return; // Is it a real popstate event or just a hash change?
var path = window.location.pathname + window.location.search,
route = routes.recognize(path);
const path = window.location.pathname + window.location.search,
route = routes.recognize(path);
if (path === currentPath) return;
currentRoute.run("unload", null, route === currentRoute);
currentPath = path;
@ -123,11 +123,11 @@ OSM.Router = function (map, rts) {
});
router.route = function (url) {
var path = url.replace(/#.*/, ""),
route = routes.recognize(path);
const path = url.replace(/#.*/, ""),
route = routes.recognize(path);
if (!route) return false;
currentRoute.run("unload", null, route === currentRoute);
var state = OSM.parseHash(url);
const state = OSM.parseHash(url);
map.setState(state);
window.history.pushState(state, document.title, url);
currentPath = path;
@ -147,17 +147,17 @@ OSM.Router = function (map, rts) {
};
router.updateHash = function () {
var hash = OSM.formatHash(map);
const hash = OSM.formatHash(map);
if (hash === currentHash) return;
currentHash = hash;
router.stateChange(OSM.parseHash(hash));
};
router.hashUpdated = function () {
var hash = location.hash;
const hash = location.hash;
if (hash === currentHash) return;
currentHash = hash;
var state = OSM.parseHash(hash);
const state = OSM.parseHash(hash);
map.setState(state);
router.stateChange(state, hash);
};
@ -176,7 +176,7 @@ OSM.Router = function (map, rts) {
};
router.load = function () {
var loadState = currentRoute.run("load", currentPath);
const loadState = currentRoute.run("load", currentPath);
router.stateChange(loadState || {});
};