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

Update issue messages after merge instead of by invalidating issues

Browse Source
This commit is contained in:
Quincy Morgan
2019-05-07 16:38:08 -04:00
parent 4ee58887af
commit 3d9f7244f0
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/commit_warnings.js
+6 -2
View File
@@ -39,7 +39,7 @@ export function uiCommitWarnings(context) {
var items = container.select('ul').selectAll('li')
.data(issues, function(d) { return d.message() + d.id; });
.data(issues, function(d) { return d.id; });
items.exit()
.remove();
@@ -53,7 +53,7 @@ export function uiCommitWarnings(context) {
itemsEnter
.append('strong')
.text(function(d) { return d.message(); });
.attr('class', 'issue-message');
itemsEnter.filter(function(d) { return d.tooltip; })
.call(tooltip()
@@ -64,6 +64,10 @@ export function uiCommitWarnings(context) {
items = itemsEnter
.merge(items);
items.selectAll('.issue-message')
.text(function(d) {
return d.message();
});
items
.on('mouseover', function(d) {
modules/ui/entity_issues.js
+6 -3
View File
@@ -49,7 +49,7 @@ export function uiEntityIssues(context) {
var containers = selection.selectAll('.issue-container')
.data(issues, function(d) { return d.message() + d.id; });
.data(issues, function(d) { return d.id; });
// Exit
containers.exit()
@@ -108,8 +108,7 @@ export function uiEntityIssues(context) {
textEnter
.append('span')
.attr('class', 'issue-message')
.text(function(d) { return d.message(); });
.attr('class', 'issue-message');
var infoButton = labelsEnter
@@ -173,6 +172,10 @@ export function uiEntityIssues(context) {
.merge(containersEnter)
.classed('active', function(d) { return d.id === _activeIssueID; });
containers.selectAll('.issue-message')
.text(function(d) {
return d.message();
});
// fixes
var fixLists = containers.selectAll('.issue-fix-list');
modules/ui/issues.js
+7 -3
View File
@@ -73,7 +73,7 @@ export function uiIssues(context) {
var items = list.selectAll('li')
.data(issues, function(d) { return d.message() + d.id; });
.data(issues, function(d) { return d.id; });
// Exit
items.exit()
@@ -126,8 +126,7 @@ export function uiIssues(context) {
textEnter
.append('span')
.attr('class', 'issue-message')
.text(function(d) { return d.message(); });
.attr('class', 'issue-message');
labelsEnter
@@ -160,6 +159,11 @@ export function uiIssues(context) {
.merge(itemsEnter)
.order();
items.selectAll('.issue-message')
.text(function(d) {
return d.message();
});
// autofix
var canAutoFix = issues.filter(function(issue) { return issue.autoFix; });