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

Merge branch 'develop' into accessible_ui

Browse Source
This commit is contained in:
Martin Raifer
2021-12-07 16:06:56 +01:00
parent 5dc8f35e39 8111e5d427
commit cc6f16d480
140 changed files with 2047 additions and 878 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ui/note_editor.js
+11 -11
View File
@@ -54,7 +54,7 @@ export function uiNoteEditor(context) {
headerEnter
.append('h2')
.html(t.html('note.title'));
.call(t.append('note.title'));
var body = selection.selectAll('.body')
@@ -149,7 +149,7 @@ export function uiNoteEditor(context) {
.append('h4')
.attr('class', '.note-save-header')
.html(function() {
return _note.isNew() ? t('note.newDescription') : t('note.newComment');
return _note.isNew() ? t.html('note.newDescription') : t.html('note.newComment');
});
var commentTextarea = noteSaveEnter
@@ -257,14 +257,14 @@ export function uiNoteEditor(context) {
authEnter
.append('span')
.html(t.html('note.login'));
.call(t.append('note.login'));
authEnter
.append('a')
.attr('target', '_blank')
.call(svgIcon('#iD-icon-out-link', 'inline'))
.append('span')
.html(t.html('login'))
.call(t.append('login'))
.on('click.note-login', function(d3_event) {
d3_event.preventDefault();
osm.authenticate();
@@ -285,7 +285,7 @@ export function uiNoteEditor(context) {
prose = prose.enter()
.append('p')
.attr('class', 'note-save-prose')
.html(t.html('note.upload_explanation'))
.call(t.append('note.upload_explanation'))
.merge(prose);
osm.userDetails(function(err, user) {
@@ -303,12 +303,12 @@ export function uiNoteEditor(context) {
userLink
.append('a')
.attr('class', 'user-info')
.html(user.display_name)
.text(user.display_name)
.attr('href', osm.userURL(user.display_name))
.attr('target', '_blank');
prose
.html(t.html('note.upload_explanation_with_user', { user: userLink.html() }));
.html(t.html('note.upload_explanation_with_user', { user: { html: userLink.html() } }));
});
}
@@ -334,12 +334,12 @@ export function uiNoteEditor(context) {
buttonEnter
.append('button')
.attr('class', 'button cancel-button secondary-action')
.html(t.html('confirm.cancel'));
.call(t.append('confirm.cancel'));
buttonEnter
.append('button')
.attr('class', 'button save-button action')
.html(t.html('note.save'));
.call(t.append('note.save'));
} else {
buttonEnter
@@ -349,7 +349,7 @@ export function uiNoteEditor(context) {
buttonEnter
.append('button')
.attr('class', 'button comment-button action')
.html(t.html('note.comment'));
.call(t.append('note.comment'));
}
@@ -369,7 +369,7 @@ export function uiNoteEditor(context) {
.html(function(d) {
var action = (d.status === 'open' ? 'close' : 'open');
var andComment = (d.newComment ? '_comment' : '');
return t('note.' + action + andComment);
return t.html('note.' + action + andComment);
})
.on('click.status', clickStatus);