CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 00:07:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add error and warning count to the list titles

Browse Source 
Hide error and warnings lists when there are no errors or warnings
This commit is contained in:
Quincy Morgan
2019-02-04 09:28:01 -05:00
parent 8c51411ad6
commit 6514f645d1
4 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/core.yaml
+6 -4
View File
@@ -1166,10 +1166,12 @@ en:
title: Issues
description: Issues
key: I
errors: Errors
warnings: Warnings
error_tooltip: error
warning_tooltip: warning
errors:
list_title: "Errors ({count})"
icon_tooltip: error
warnings:
list_title: "Warnings ({count})"
icon_tooltip: warning
options:
title: Options
features_to_validate:
dist/locales/en.json
Vendored
+8 -4
View File
@@ -1413,10 +1413,14 @@
"title": "Issues",
"description": "Issues",
"key": "I",
"errors": "Errors",
"warnings": "Warnings",
"error_tooltip": "error",
"warning_tooltip": "warning",
"errors": {
"list_title": "Errors ({count})",
"icon_tooltip": "error"
},
"warnings": {
"list_title": "Warnings ({count})",
"icon_tooltip": "warning"
},
"options": {
"title": "Options"
},
modules/ui/entity_issues.js
+1 -1
View File
@@ -79,7 +79,7 @@ export function uiEntityIssues(context) {
var iconSuffix = d.severity === 'warning' ? 'alert' : 'error';
d3_select(this)
.append('div')
.attr('title', t('issues.'+d.severity+'_tooltip'))
.attr('title', t('issues.'+d.severity+'s.icon_tooltip'))
.style('display', 'inline')
.call(svgIcon('#iD-icon-' + iconSuffix, 'pre-text'));
});
modules/ui/issues.js
+22 -9
View File
@@ -165,7 +165,7 @@ export function uiIssues(context) {
var iconSuffix = d.severity === 'warning' ? 'alert' : 'error';
d3_select(this)
.append('div')
.attr('title', t('issues.'+d.severity+'_tooltip'))
.attr('title', t('issues.'+d.severity+'s.icon_tooltip'))
.style('display', 'inline')
.call(svgIcon('#iD-icon-' + iconSuffix, 'pre-text'));
});
@@ -219,15 +219,30 @@ export function uiIssues(context) {
}
function update() {
var errors = context.validator().getErrors();
pane.select('.issues-errors').classed('hide', errors.length === 0);
if (errors.length > 0) {
pane.select('.hide-toggle-issues_errors .hide-toggle-text')
.text(t('issues.errors.list_title', { count: errors.length }))
if (!pane.select('.disclosure-wrap-issues_errors').classed('hide')) {
updateErrorsList();
}
}
var warnings = context.validator().getWarnings();
pane.select('.issues-warnings').classed('hide', warnings.length === 0);
if (warnings.length > 0) {
pane.select('.hide-toggle-issues_warnings .hide-toggle-text')
.text(t('issues.warnings.list_title', { count: warnings.length }))
if (!pane.select('.disclosure-wrap-issues_warnings').classed('hide')) {
updateWarningsList();
}
}
if (!pane.select('.disclosure-wrap-issues_options').classed('hide')) {
updateFeatureApplicabilityList();
}
if (!pane.select('.disclosure-wrap-issues_errors').classed('hide')) {
updateErrorsList();
}
if (!pane.select('.disclosure-wrap-issues_warnings').classed('hide')) {
updateWarningsList();
}
}
function issues(selection) {
@@ -311,7 +326,6 @@ export function uiIssues(context) {
.append('div')
.attr('class', 'issues-errors')
.call(uiDisclosure(context, 'issues_errors', true)
.title(t('issues.errors'))
.content(renderErrorsList)
);
@@ -320,7 +334,6 @@ export function uiIssues(context) {
.append('div')
.attr('class', 'issues-warnings')
.call(uiDisclosure(context, 'issues_warnings', true)
.title(t('issues.warnings'))
.content(renderWarningsList)
);