From ea3f6c215dad1602c8e645a79af8b3333d8dcd03 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Sat, 12 Apr 2025 02:28:53 +0300 Subject: [PATCH] Convert changeset (un)highlight to toggle function --- .../index/history-changesets-layer.js | 8 ++------ app/assets/javascripts/index/history.js | 19 +++++++------------ 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/index/history-changesets-layer.js b/app/assets/javascripts/index/history-changesets-layer.js index e8ba99ddd..28b3a30d2 100644 --- a/app/assets/javascripts/index/history-changesets-layer.js +++ b/app/assets/javascripts/index/history-changesets-layer.js @@ -64,12 +64,8 @@ OSM.HistoryChangesetsLayer = L.FeatureGroup.extend({ } }, - highlightChangeset: function (id) { - this.getLayer(id)?.setStyle({ fillOpacity: 0.3, color: "#FF6600", weight: 3 }); - }, - - unHighlightChangeset: function (id) { - this.getLayer(id)?.setStyle({ fillOpacity: 0, color: "#FF9500", weight: 2 }); + toggleChangesetHighlight: function (id, state) { + this.getLayer(id)?.setStyle(state ? { fillOpacity: 0.3, color: "#FF6600", weight: 3 } : { fillOpacity: 0, color: "#FF9500", weight: 2 }); }, getLayerId: function (layer) { diff --git a/app/assets/javascripts/index/history.js b/app/assets/javascripts/index/history.js index 289081ca1..8c8cd66e0 100644 --- a/app/assets/javascripts/index/history.js +++ b/app/assets/javascripts/index/history.js @@ -7,18 +7,18 @@ OSM.History = function (map) { $("#sidebar_content") .on("click", ".changeset_more a", loadMoreChangesets) .on("mouseover", "[data-changeset]", function () { - highlightChangeset($(this).data("changeset").id); + toggleChangesetHighlight($(this).data("changeset").id, true); }) .on("mouseout", "[data-changeset]", function () { - unHighlightChangeset($(this).data("changeset").id); + toggleChangesetHighlight($(this).data("changeset").id, false); }); const changesetsLayer = new OSM.HistoryChangesetsLayer() .on("mouseover", function (e) { - highlightChangeset(e.layer.id); + toggleChangesetHighlight(e.layer.id, true); }) .on("mouseout", function (e) { - unHighlightChangeset(e.layer.id); + toggleChangesetHighlight(e.layer.id, false); }) .on("click", function (e) { clickChangeset(e.layer.id, e.originalEvent); @@ -83,14 +83,9 @@ OSM.History = function (map) { }); } - function highlightChangeset(id) { - changesetsLayer.highlightChangeset(id); - $("#changeset_" + id).addClass("selected"); - } - - function unHighlightChangeset(id) { - changesetsLayer.unHighlightChangeset(id); - $("#changeset_" + id).removeClass("selected"); + function toggleChangesetHighlight(id, state) { + changesetsLayer.toggleChangesetHighlight(id, state); + $("#changeset_" + id).toggleClass("selected", state); } function clickChangeset(id, e) { -- 2.39.5