Use a button instead of a link to remove a marker
Using a button for interactive elements is better, as explained in
commit 5311daadf.
Since buttons with "type=button" do nothing by default, we no longer
need to call `preventDefault()` when clicking it.
This commit is contained in:
@@ -43,8 +43,7 @@
|
||||
newMarker.addTo(map);
|
||||
return newMarker;
|
||||
};
|
||||
removeMarker = function(e) {
|
||||
e.preventDefault();
|
||||
removeMarker = function() {
|
||||
if (marker) {
|
||||
map.removeLayer(marker);
|
||||
marker = null;
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
.map-location-remove-marker {
|
||||
border-bottom: 1px dotted #cf2a0e;
|
||||
border-radius: 0;
|
||||
color: $delete;
|
||||
display: inline-block;
|
||||
cursor: pointer;
|
||||
margin-bottom: $line-height;
|
||||
margin-top: $line-height / 2;
|
||||
|
||||
@@ -10,7 +11,6 @@
|
||||
&:focus {
|
||||
border-bottom-style: solid;
|
||||
color: #cf2a0e;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -33,14 +33,15 @@ class Shared::MapLocationComponent < ApplicationComponent
|
||||
t("proposals.form.map_remove_marker")
|
||||
end
|
||||
|
||||
def remove_marker_link_id
|
||||
"remove-marker-link-#{dom_id(map_location)}"
|
||||
def remove_marker_id
|
||||
"remove-marker-#{dom_id(map_location)}"
|
||||
end
|
||||
|
||||
def remove_marker
|
||||
link_to remove_marker_label, "#",
|
||||
id: remove_marker_link_id,
|
||||
class: "map-location-remove-marker"
|
||||
button_tag remove_marker_label,
|
||||
id: remove_marker_id,
|
||||
class: "map-location-remove-marker",
|
||||
type: "button"
|
||||
end
|
||||
|
||||
def data
|
||||
@@ -52,7 +53,7 @@ class Shared::MapLocationComponent < ApplicationComponent
|
||||
map_tiles_provider: Rails.application.secrets.map_tiles_provider,
|
||||
map_tiles_provider_attribution: Rails.application.secrets.map_tiles_provider_attribution,
|
||||
marker_editable: editable?,
|
||||
marker_remove_selector: "##{remove_marker_link_id}",
|
||||
marker_remove_selector: "##{remove_marker_id}",
|
||||
marker_investments_coordinates: investments_coordinates,
|
||||
marker_latitude: map_location.latitude.presence,
|
||||
marker_longitude: map_location.longitude.presence
|
||||
|
||||
@@ -215,7 +215,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
|
||||
do_login_for mappable.author, management: management
|
||||
|
||||
visit send(mappable_edit_path, id: mappable.id)
|
||||
click_link "Remove map marker"
|
||||
click_button "Remove map marker"
|
||||
click_on "Save changes"
|
||||
|
||||
expect(page).not_to have_css(".map-location")
|
||||
@@ -236,7 +236,7 @@ shared_examples "mappable" do |mappable_factory_name, mappable_association_name,
|
||||
do_login_for mappable.author, management: management
|
||||
|
||||
visit send(mappable_edit_path, id: mappable.id)
|
||||
click_link "Remove map marker"
|
||||
click_button "Remove map marker"
|
||||
click_on "Save changes"
|
||||
|
||||
expect(page).not_to have_content "Map location can't be blank"
|
||||
|
||||
Reference in New Issue
Block a user