From 907c4d9616fc034573a3483cd9810704dd074f02 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 29 Jan 2019 12:18:02 -0500 Subject: [PATCH] Rename fix function from `action` to `onClick` --- modules/ui/entity_issues.js | 2 +- modules/validations/crossing_ways.js | 2 +- modules/validations/deprecated_tag.js | 2 +- modules/validations/generic_name.js | 2 +- modules/validations/highway_almost_junction.js | 4 ++-- modules/validations/missing_tag.js | 4 ++-- modules/validations/old_multipolygon.js | 2 +- modules/validations/tag_suggests_area.js | 2 +- modules/validations/validation_issue.js | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/ui/entity_issues.js b/modules/ui/entity_issues.js index 6b23c9464..737fe0ad0 100644 --- a/modules/ui/entity_issues.js +++ b/modules/ui/entity_issues.js @@ -130,7 +130,7 @@ export function uiEntityIssues(context) { return d.title; }) .on('click', function(d) { - d.action(); + d.onClick(); }); } }); diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js index e95048c13..2631f37fc 100644 --- a/modules/validations/crossing_ways.js +++ b/modules/validations/crossing_ways.js @@ -257,7 +257,7 @@ export function validationHighwayCrossingOtherWays(context) { fixes: [ new validationIssueFix({ title: t('issues.fix.add_connection_vertex.title'), - action: function() { + onClick: function() { var loc = this.issue.coordinates; var ways = this.issue.info.ways; diff --git a/modules/validations/deprecated_tag.js b/modules/validations/deprecated_tag.js index a588cbfe0..9305bc864 100644 --- a/modules/validations/deprecated_tag.js +++ b/modules/validations/deprecated_tag.js @@ -41,7 +41,7 @@ export function validationDeprecatedTag(context) { fixes: [ new validationIssueFix({ title: t('issues.fix.upgrade_tags.title'), - action: function() { + onClick: function() { var entity = this.issue.entities[0]; var tags = _clone(entity.tags); var replaceTags = this.issue.info.replaceTags; diff --git a/modules/validations/generic_name.js b/modules/validations/generic_name.js index 532b14ee2..21ac4d5da 100644 --- a/modules/validations/generic_name.js +++ b/modules/validations/generic_name.js @@ -61,7 +61,7 @@ export function validationGenericName(context) { fixes: [ new validationIssueFix({ title: t('issues.fix.remove_generic_name.title'), - action: function() { + onClick: function() { var entity = this.issue.entities[0]; var tags = _clone(entity.tags); delete tags.name; diff --git a/modules/validations/highway_almost_junction.js b/modules/validations/highway_almost_junction.js index f68b2c2ba..c17717988 100644 --- a/modules/validations/highway_almost_junction.js +++ b/modules/validations/highway_almost_junction.js @@ -121,7 +121,7 @@ export function validationHighwayAlmostJunction(context) { var fixes = [ new validationIssueFix({ title: t('issues.fix.connect_almost_junction.title'), - action: function() { + onClick: function() { var endNode = this.issue.entities[1], targetEdge = this.issue.info.edge, crossLoc = this.issue.info.cross_loc; @@ -136,7 +136,7 @@ export function validationHighwayAlmostJunction(context) { // node has no tags, suggest noexit fix fixes.push(new validationIssueFix({ title: t('issues.fix.tag_as_disconnected.title'), - action: function() { + onClick: function() { var nodeID = this.issue.entities[1].id; context.perform( actionChangeTags(nodeID, {noexit: 'yes'}), diff --git a/modules/validations/missing_tag.js b/modules/validations/missing_tag.js index 09dd9b3f5..4c2006988 100644 --- a/modules/validations/missing_tag.js +++ b/modules/validations/missing_tag.js @@ -42,13 +42,13 @@ export function validationMissingTag(context) { fixes: [ new validationIssueFix({ title: t('issues.fix.select_preset.title'), - action: function() { + onClick: function() { context.ui().sidebar.showPresetList(); } }), new validationIssueFix({ title: t('issues.fix.delete_feature.title'), - action: function() { + onClick: function() { var id = this.issue.entities[0].id; operationDelete([id], context)(); } diff --git a/modules/validations/old_multipolygon.js b/modules/validations/old_multipolygon.js index a7433a09b..69870bc0f 100644 --- a/modules/validations/old_multipolygon.js +++ b/modules/validations/old_multipolygon.js @@ -29,7 +29,7 @@ export function validationOldMultipolygon(context) { fixes: [ new validationIssueFix({ title: t('issues.fix.move_tags.title'), - action: function() { + onClick: function() { var outerWay = this.issue.entities[0]; var multipolygon = this.issue.entities[1]; context.perform( diff --git a/modules/validations/tag_suggests_area.js b/modules/validations/tag_suggests_area.js index c12923ac0..5b1f1f1c4 100644 --- a/modules/validations/tag_suggests_area.js +++ b/modules/validations/tag_suggests_area.js @@ -58,7 +58,7 @@ export function validationTagSuggestsArea(context) { fixes: [ new validationIssueFix({ title: t('issues.fix.remove_tags.title'), - action: function() { + onClick: function() { var entity = this.issue.entities[0]; var tags = _clone(entity.tags); for (var key in suggestingTags) { diff --git a/modules/validations/validation_issue.js b/modules/validations/validation_issue.js index 5755ea437..91e1ff3f1 100644 --- a/modules/validations/validation_issue.js +++ b/modules/validations/validation_issue.js @@ -94,7 +94,7 @@ export function validationIssue(attrs) { export function validationIssueFix(attrs) { this.title = attrs.title; - this.action = attrs.action; + this.onClick = attrs.onClick; // the issue this fix is for this.issue = null;