CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-04-21 19:26:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix varied validation messages and redeclaration

Browse Source 
I've hijacked the data property for the purposes of changing the message
based on whether multiple values in a list are erroneous
This commit is contained in:
SilentSpike
2019-06-06 15:34:16 +01:00
committed by Quincy Morgan
parent 591e41f5ec
commit f02238ce23
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/validations/invalid_format.js
+25 -26
View File
@@ -20,36 +20,44 @@ export function validationFormatting() {
return !valid_scheme.test(url);
}
function showReferenceEmail(selection) {
selection.selectAll('.issue-reference')
.data([0])
.enter()
.append('div')
.attr('class', 'issue-reference')
.text(t('issues.invalid_format.email.reference'));
}
function showReferenceWebsite(selection) {
selection.selectAll('.issue-reference')
.data([0])
.enter()
.append('div')
.attr('class', 'issue-reference')
.text(t('issues.invalid_format.website.reference'));
}
if (entity.tags.website) {
// Multiple websites are possible
var websites = entity.tags.website.split(';').filter(isSchemeMissing);
if (websites.length) {
var multi = (websites.length > 1) ? '_multi' : '';
issues.push(new validationIssue({
type: type,
subtype: 'website',
severity: 'warning',
message: function() {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.invalid_format.website.message' + multi, { feature: utilDisplayLabel(entity, context), site: websites.join(', ') }) : '';
return entity ? t('issues.invalid_format.website.message' + this.data,
{ feature: utilDisplayLabel(entity, context), site: websites.join(', ') }) : '';
},
reference: showReferenceWebsite,
entityIds: [entity.id],
hash: websites.join()
hash: websites.join(),
data: (websites.length > 1) ? '_multi' : ''
}));
}
function showReferenceWebsite(selection) {
selection.selectAll('.issue-reference')
.data([0])
.enter()
.append('div')
.attr('class', 'issue-reference')
.text(t('issues.invalid_format.website.reference'));
}
}
if (entity.tags.email) {
@@ -57,30 +65,21 @@ export function validationFormatting() {
var emails = entity.tags.email.split(';').filter(isInvalidEmail);
if (emails.length) {
var multi = (emails.length > 1) ? '_multi' : '';
issues.push(new validationIssue({
type: type,
subtype: 'email',
severity: 'warning',
message: function() {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t('issues.invalid_format.email.message' + multi, { feature: utilDisplayLabel(entity, context), email: emails.join(', ') }) : '';
return entity ? t('issues.invalid_format.email.message' + this.data,
{ feature: utilDisplayLabel(entity, context), email: emails.join(', ') }) : '';
},
reference: showReferenceEmail,
entityIds: [entity.id],
hash: emails.join()
hash: emails.join(),
data: (emails.length > 1) ? '_multi' : ''
}));
}
function showReferenceEmail(selection) {
selection.selectAll('.issue-reference')
.data([0])
.enter()
.append('div')
.attr('class', 'issue-reference')
.text(t('issues.invalid_format.email.reference'));
}
}
return issues;