From 4e1fdc62b25088d8683d1b087fbd01e6a8d43a90 Mon Sep 17 00:00:00 2001 From: Marwin Hochfelsner <50826859+hlfan@users.noreply.github.com> Date: Sun, 19 Jul 2026 15:26:34 +0200 Subject: [PATCH] Rename full page load method --- app/assets/javascripts/index_modules/changeset.js | 6 +++--- app/assets/javascripts/index_modules/directions.js | 2 +- app/assets/javascripts/index_modules/element.js | 4 ++-- app/assets/javascripts/index_modules/export.js | 4 ++-- app/assets/javascripts/index_modules/history.js | 4 ++-- app/assets/javascripts/index_modules/home.js | 2 +- app/assets/javascripts/index_modules/index.js | 2 +- app/assets/javascripts/index_modules/new_note.js | 4 ++-- app/assets/javascripts/index_modules/note.js | 2 +- app/assets/javascripts/index_modules/query.js | 4 ++-- app/assets/javascripts/index_modules/search.js | 4 ++-- app/assets/javascripts/router.js | 8 ++++---- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/index_modules/changeset.js b/app/assets/javascripts/index_modules/changeset.js index 7887640d3..c448eb86c 100644 --- a/app/assets/javascripts/index_modules/changeset.js +++ b/app/assets/javascripts/index_modules/changeset.js @@ -12,10 +12,10 @@ export default function (map) { page.pushstate = page.popstate = function (path) { OSM.loadSidebarContent(path) - .then(page.load); + .then(page.init); }; - page.load = function () { + page.init = function () { const changesetData = content.find("[data-changeset]").data("changeset"); changesetData.type = "changeset"; @@ -53,7 +53,7 @@ export default function (map) { }); }) .then(() => OSM.loadSidebarContent(location.pathname)) - .then(page.load) + .then(page.init) .catch(error => { content.find("button[data-method][data-url]").prop("disabled", false); content.find("#comment-error") diff --git a/app/assets/javascripts/index_modules/directions.js b/app/assets/javascripts/index_modules/directions.js index e9d6325eb..89b03a9ff 100644 --- a/app/assets/javascripts/index_modules/directions.js +++ b/app/assets/javascripts/index_modules/directions.js @@ -253,7 +253,7 @@ export default function (map) { return sidebarReadyPromise ??= OSM.loadSidebarContent("/directions"); } - page.pushstate = page.popstate = page.load = function () { + page.pushstate = page.popstate = page.init = function () { initializeFromParams(); $(".search_form").hide(); diff --git a/app/assets/javascripts/index_modules/element.js b/app/assets/javascripts/index_modules/element.js index fff0cd204..2369aa1d6 100644 --- a/app/assets/javascripts/index_modules/element.js +++ b/app/assets/javascripts/index_modules/element.js @@ -9,10 +9,10 @@ export function element(type) { page.pushstate = page.popstate = function (path, id, version) { OSM.loadSidebarContent(path) - .then(() => page.load(path, id, version, true)); + .then(() => page.init(path, id, version, true)); }; - page.load = function (path, id, version, keepViewport) { + page.init = function (path, id, version, keepViewport) { page._addObject(type, id, version, keepViewport); $(".numbered_pagination").trigger("numbered_pagination:enable"); abortController = new AbortController(); diff --git a/app/assets/javascripts/index_modules/export.js b/app/assets/javascripts/index_modules/export.js index dcf7887af..a3ab0c538 100644 --- a/app/assets/javascripts/index_modules/export.js +++ b/app/assets/javascripts/index_modules/export.js @@ -82,10 +82,10 @@ export default function (map) { page.pushstate = page.popstate = function (path) { OSM.loadSidebarContent(path) - .then(page.load); + .then(page.init); }; - page.load = function () { + page.init = function () { map .addLayer(locationFilter) .on("moveend", update); diff --git a/app/assets/javascripts/index_modules/history.js b/app/assets/javascripts/index_modules/history.js index 4676ba3ab..356ad17e8 100644 --- a/app/assets/javascripts/index_modules/history.js +++ b/app/assets/javascripts/index_modules/history.js @@ -289,10 +289,10 @@ export default function (map) { page.pushstate = page.popstate = function (path) { OSM.loadSidebarContent(path) - .then(page.load); + .then(page.init); }; - page.load = function () { + page.init = function () { map.addLayer(changesetsLayer); map.on("moveend", moveEndListener); map.on("zoomend", zoomEndListener); diff --git a/app/assets/javascripts/index_modules/home.js b/app/assets/javascripts/index_modules/home.js index bd3608cdc..13510fae0 100644 --- a/app/assets/javascripts/index_modules/home.js +++ b/app/assets/javascripts/index_modules/home.js @@ -8,7 +8,7 @@ export default function (map) { const page = {}; - page.pushstate = page.popstate = page.load = function () { + page.pushstate = page.popstate = page.init = function () { map.setSidebarOverlaid(true); clearMarker(); diff --git a/app/assets/javascripts/index_modules/index.js b/app/assets/javascripts/index_modules/index.js index 223dba291..0f60ca335 100644 --- a/app/assets/javascripts/index_modules/index.js +++ b/app/assets/javascripts/index_modules/index.js @@ -6,7 +6,7 @@ export default function (map) { document.title = OSM.i18n.t("layouts.project_name.title"); }; - page.load = function () { + page.init = function () { const params = new URLSearchParams(location.search); if (params.has("query")) { $("#sidebar .search_form input[name=query]").value(params.get("query")); diff --git a/app/assets/javascripts/index_modules/new_note.js b/app/assets/javascripts/index_modules/new_note.js index fb264e673..60f4767c7 100644 --- a/app/assets/javascripts/index_modules/new_note.js +++ b/app/assets/javascripts/index_modules/new_note.js @@ -99,10 +99,10 @@ export default function (map) { page.pushstate = page.popstate = function (path) { OSM.loadSidebarContent(path) - .then(() => page.load(path)); + .then(() => page.init(path)); }; - page.load = function (path) { + page.init = function (path) { control.addClass("active"); map.addLayer(noteLayer); diff --git a/app/assets/javascripts/index_modules/note.js b/app/assets/javascripts/index_modules/note.js index 4303c3c34..a143801be 100644 --- a/app/assets/javascripts/index_modules/note.js +++ b/app/assets/javascripts/index_modules/note.js @@ -11,7 +11,7 @@ export default function (map) { }); }; - page.load = function (path, id) { + page.init = function (path, id) { initialize(path, id); }; diff --git a/app/assets/javascripts/index_modules/query.js b/app/assets/javascripts/index_modules/query.js index 25ee02387..eb8fd56d4 100644 --- a/app/assets/javascripts/index_modules/query.js +++ b/app/assets/javascripts/index_modules/query.js @@ -200,10 +200,10 @@ export default function (map) { page.pushstate = page.popstate = function (path) { OSM.loadSidebarContent(path) - .then(() => page.load(path, true)); + .then(() => page.init(path, true)); }; - page.load = function (path, noCentre) { + page.init = function (path, noCentre) { const params = new URLSearchParams(path.substring(path.indexOf("?"))), latlng = L.latLng(params.get("lat"), params.get("lon")); diff --git a/app/assets/javascripts/index_modules/search.js b/app/assets/javascripts/index_modules/search.js index 6bff0d89d..49034fa87 100644 --- a/app/assets/javascripts/index_modules/search.js +++ b/app/assets/javascripts/index_modules/search.js @@ -79,10 +79,10 @@ export default function (map) { $(".search_form input[name=query]").val(params.get("lat") + ", " + params.get("lon")); } OSM.loadSidebarContent(path) - .then(page.load); + .then(page.init); }; - page.load = function () { + page.init = function () { $(".search_results_entry[data-href]").each(function (index) { const entry = $(this); fetchReplace(this.dataset, entry.children().first()) diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js index 9b7d4b365..222e8b6a4 100644 --- a/app/assets/javascripts/router.js +++ b/app/assets/javascripts/router.js @@ -13,13 +13,13 @@ Route controller objects can define four methods that are called at defined times during routing: - * The `load` method is called by the router when a path which matches the + * The `init` method is called by the router when a path which matches the route's path template is loaded via a normal full page load. It is passed as arguments the URL path plus any matching arguments for placeholders in the path template. * The `pushstate` method is called when a page which matches the route's path - template is loaded via pushState. It is passed the same arguments as `load`. + template is loaded via pushState. It is passed the same arguments as `init`. * The `popstate` method is called when returning to a previously pushState-loaded page via popstate (i.e. browser back/forward buttons). @@ -27,7 +27,7 @@ * The `unload` method is called on the exiting route controller when navigating via pushState or popstate to another route. - Note that while `load` is not called by the router for pushState-based loads, + Note that while `init` is not called by the router for pushState-based loads, it's frequently useful for route controllers to call it manually inside their definition of the `pushstate` and `popstate` methods. @@ -189,7 +189,7 @@ OSM.Router = function (map, rts) { }; router.load = async function () { - const loadState = await currentRoute.run("load", currentPath); + const loadState = await currentRoute.run("init", currentPath); router.stateChange(loadState || {}); }; -- 2.47.3