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

Merge pull request #8817 from openstreetmap/issue-8813

Browse Source 
reduce direct html injection, add escaping where necessary
This commit is contained in:
Martin Raifer
2021-11-30 12:38:45 +01:00
committed by GitHub
parent f6cbc65cdc e5aedb249f
commit e66edcbc99
108 changed files with 454 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+6
View File
@@ -14,6 +14,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
##### YYYY-MMM-DD
#### :newspaper: News
#### :shield: Security
#### :mega: Release Highlights
#### :boom: Breaking Changes
#### :tada: New Features
@@ -41,6 +42,8 @@ _Breaking developer changes, which may affect downstream projects or sites that
#### :newspaper: News
* We maintain a running changelog now! Upcoming changes will be added to the _[Unreleased](#Unreleased)_ section of this changelog as soon as they are ready in the [development version](https://ideditor.netlify.app/) of the iD editor. ([#8805])
#### :shield: Security
* Fix missing escaping of external texts and content such as OSM user names, OSM tags, etc. which had opened a way to inject arbitrary HTML into the iD editor, potentially making XSS attacks possible. ([#8813])
#### :boom: Breaking Changes
#### :tada: New Features
#### :sparkles: Usability & Accessibility
@@ -55,6 +58,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
* Fix glitching out turn restriction minimap on narrow sidebars ([#8792])
* Fix a bug which made it impossible to switch to a custom TMS imagery layer after using a custom WMS source and vice versa ([#8057])
#### :earth_asia: Localization
* deprecate ~`t.html`~ for providing localized texts, which is replaced by the new method `t.append` which directly and safely appends the localized strings to the DOM. ([#8817])
#### :hourglass: Performance
#### :mortar_board: Walkthrough / Help
#### :rocket: Presets
@@ -71,6 +75,8 @@ _Breaking developer changes, which may affect downstream projects or sites that
[#8800]: https://github.com/openstreetmap/iD/pull/8800
[#8805]: https://github.com/openstreetmap/iD/issues/8805
[#8807]: https://github.com/openstreetmap/iD/issues/8807
[#8813]: https://github.com/openstreetmap/iD/issues/8813
[#8817]: https://github.com/openstreetmap/iD/pull/8817
# 2.20.2
##### 2021-Oct-28
data/core.yaml
+1 -1
View File
@@ -999,7 +999,7 @@ en:
location: 'This feature was moved by both you and {user}.'
nodelist: 'Nodes were changed by both you and {user}.'
memberlist: 'Relation members were changed by both you and {user}.'
tags: 'You changed the <b>{tag}</b> tag to "{local}" and {user} changed it to "{remote}".'
tags: 'You changed the "{tag}" tag to "{local}" and {user} changed it to "{remote}".'
success:
just_edited: "You just edited OpenStreetMap!"
thank_you: "Thank you for improving the map."
dist/locales/en.min.json
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
modules/actions/merge_remote_changes.js
+9 -9
View File
@@ -1,5 +1,6 @@
import deepEqual from 'fast-deep-equal';
import { diff3Merge } from 'node-diff3';
import { escape } from 'lodash';
import { t } from '../core/localizer';
import { actionDeleteMultiple } from './delete_multiple';
@@ -14,7 +15,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
function user(d) {
return (typeof formatUser === 'function') ? formatUser(d) : d;
return (typeof formatUser === 'function') ? formatUser(d) : escape(d);
}
@@ -31,7 +32,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
return target.update({loc: remote.loc});
}
_conflicts.push(t('merge_remote_changes.conflict.location', { user: user(remote.user) }));
_conflicts.push(t.html('merge_remote_changes.conflict.location', { user: { html: user(remote.user) } }));
return target;
}
@@ -64,7 +65,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
} else if (deepEqual(c.o, c.b)) { // only changed locally
nodes.push.apply(nodes, c.a);
} else { // changed both locally and remotely
_conflicts.push(t('merge_remote_changes.conflict.nodelist', { user: user(remote.user) }));
_conflicts.push(t.html('merge_remote_changes.conflict.nodelist', { user: { html: user(remote.user) } }));
break;
}
}
@@ -118,7 +119,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
if (remote.visible) {
target = mergeLocation(remote, target);
} else {
_conflicts.push(t('merge_remote_changes.conflict.deleted', { user: user(remote.user) }));
_conflicts.push(t.html('merge_remote_changes.conflict.deleted', { user: { html: user(remote.user) } }));
}
if (_conflicts.length !== ccount) break;
@@ -149,7 +150,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
return target.update({members: remote.members});
}
_conflicts.push(t('merge_remote_changes.conflict.memberlist', { user: user(remote.user) }));
_conflicts.push(t.html('merge_remote_changes.conflict.memberlist', { user: { html: user(remote.user) } }));
return target;
}
@@ -176,9 +177,8 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
if (o[k] !== b[k] && a[k] !== b[k]) { // changed remotely..
if (o[k] !== a[k]) { // changed locally..
_conflicts.push(t('merge_remote_changes.conflict.tags',
{ tag: k, local: a[k], remote: b[k], user: user(remote.user) }));
_conflicts.push(t.html('merge_remote_changes.conflict.tags',
{ tag: k, local: a[k], remote: b[k], user: { html: user(remote.user) } }));
} else { // unchanged locally, accept remote change..
if (b.hasOwnProperty(k)) {
tags[k] = b[k];
@@ -224,7 +224,7 @@ export function actionMergeRemoteChanges(id, localGraph, remoteGraph, discardTag
return graph.replace(target);
} else {
_conflicts.push(t('merge_remote_changes.conflict.deleted', { user: user(remote.user) }));
_conflicts.push(t.html('merge_remote_changes.conflict.deleted', { user: { html: user(remote.user) } }));
return graph; // do nothing
}
}
modules/behavior/draw_way.js
+4 -4
View File
@@ -447,7 +447,7 @@ export function behaviorDrawWay(context, wayID, mode, startGraph) {
context.ui().flash
.duration(4000)
.iconName('#iD-icon-no')
.label(t('operations.follow.error.needs_more_initial_nodes'))();
.label(t.html('operations.follow.error.needs_more_initial_nodes'))();
return;
}
@@ -461,7 +461,7 @@ export function behaviorDrawWay(context, wayID, mode, startGraph) {
context.ui().flash
.duration(4000)
.iconName('#iD-icon-no')
.label(t(`operations.follow.error.intersection_of_multiple_ways.${featureType}`))();
.label(t.html(`operations.follow.error.intersection_of_multiple_ways.${featureType}`))();
return;
}
@@ -472,7 +472,7 @@ export function behaviorDrawWay(context, wayID, mode, startGraph) {
context.ui().flash
.duration(4000)
.iconName('#iD-icon-no')
.label(t(`operations.follow.error.intersection_of_different_ways.${featureType}`))();
.label(t.html(`operations.follow.error.intersection_of_different_ways.${featureType}`))();
return;
}
@@ -501,7 +501,7 @@ export function behaviorDrawWay(context, wayID, mode, startGraph) {
context.ui().flash
.duration(4000)
.iconName('#iD-icon-no')
.label(t('operations.follow.error.unknown'))();
.label(t.html('operations.follow.error.unknown'))();
}
}
modules/core/localizer.js
+35 -5
View File
@@ -1,3 +1,5 @@
import { escape } from 'lodash-es';
import { fileFetcher } from './file_fetcher';
import { utilDetect } from '../util/detect';
import { utilStringQs } from '../util';
@@ -347,14 +349,42 @@ export function coreLocalizer() {
};
// Returns the localized text wrapped in an HTML element encoding the locale info
/**
* @deprecated This method is considered deprecated. Instead, use the direct DOM manipulating
* method `t.append`.
*/
localizer.t.html = function(stringId, replacements, locale) {
const info = localizer.tInfo(stringId, replacements, locale);
// text may be empty or undefined if `replacements.default` is
return info.text ? localizer.htmlForLocalizedText(info.text, info.locale) : '';
// replacement string might be html unsafe, so we need to escape it except if it is explicitly marked as html code
replacements = Object.assign({}, replacements);
for (var k in replacements) {
if (typeof replacements[k] === 'string') {
replacements[k] = escape(replacements[k]);
}
if (typeof replacements[k] === 'object' && typeof replacements[k].html === 'string') {
replacements[k] = replacements[k].html;
}
}
const info = localizer.tInfo(stringId, replacements, locale);
// text may be empty or undefined if `replacements.default` is
if (info.text) {
return `<span class="localized-text" lang="${info.locale || 'und'}">${info.text}</span>`;
} else {
return '';
}
};
localizer.htmlForLocalizedText = function(text, localeCode) {
return `<span class="localized-text" lang="${localeCode || 'unknown'}">${text}</span>`;
// Adds localized text wrapped as an HTML span element with locale info to the DOM
localizer.t.append = function(stringId, replacements, locale) {
return function(selection) {
const info = localizer.tInfo(stringId, replacements, locale);
return selection.append('span')
.attr('class', 'localized-text')
.attr('lang', info.locale || 'und')
.text((replacements && replacements.prefix || '')
+ info.text
+ (replacements &&replacements.suffix || ''));
};
};
localizer.languageName = (code, options) => {
modules/core/uploader.js
+2 -1
View File
@@ -1,4 +1,5 @@
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { escape } from 'lodash-es';
import { fileFetcher } from './file_fetcher';
import { actionDiscardTags } from '../actions/discard_tags';
@@ -218,7 +219,7 @@ export function coreUploader(context) {
};
}
function formatUser(d) {
return '<a href="' + osm.userURL(d) + '" target="_blank">' + d + '</a>';
return '<a href="' + osm.userURL(d) + '" target="_blank">' + escape(d) + '</a>';
}
function entityName(entity) {
return utilDisplayName(entity) || (utilDisplayType(entity.id) + ' ' + entity.id);
modules/modes/drag_node.js
+2 -2
View File
@@ -239,7 +239,7 @@ export function modeDragNode(context) {
context.ui().flash
.duration(4000)
.iconName('#iD-icon-no')
.label(t('operations.connect.' + isInvalid,
.label(t.html('operations.connect.' + isInvalid,
{ relation: presetManager.item('type/restriction').name() }
))();
}
@@ -248,7 +248,7 @@ export function modeDragNode(context) {
context.ui().flash
.duration(3000)
.iconName('#iD-icon-no')
.label(t('self_intersection.error.' + errorID))();
.label(t.html('self_intersection.error.' + errorID))();
} else {
if (nope) { // about to un-nope, remove hint
context.ui().flash
modules/modes/draw_area.js
+1 -1
View File
@@ -12,7 +12,7 @@ export function modeDrawArea(context, wayID, startGraph, button) {
.on('rejectedSelfIntersection.modeDrawArea', function() {
context.ui().flash
.iconName('#iD-icon-no')
.label(t('self_intersection.error.areas'))();
.label(t.html('self_intersection.error.areas'))();
});
mode.wayID = wayID;
modules/modes/draw_line.js
+1 -1
View File
@@ -12,7 +12,7 @@ export function modeDrawLine(context, wayID, startGraph, button, affix, continui
.on('rejectedSelfIntersection.modeDrawLine', function() {
context.ui().flash
.iconName('#iD-icon-no')
.label(t('self_intersection.error.lines'))();
.label(t.html('self_intersection.error.lines'))();
});
mode.wayID = wayID;
modules/modes/select.js
+1 -1
View File
@@ -400,7 +400,7 @@ export function modeSelect(context, selectedIDs) {
.duration(4000)
.iconName('#iD-icon-no')
.iconClass('operation disabled')
.label(t('operations.scale.' + disabled + '.' + multi))();
.label(t.html('operations.scale.' + disabled + '.' + multi))();
} else {
const pivot = context.projection(extent.center());
const annotation = t('operations.scale.annotation.' + (isUp ? 'up' : 'down') + '.feature', { n: selectedIDs.length });
modules/renderer/background_source.js
+4 -3
View File
@@ -1,5 +1,6 @@
import { geoArea as d3_geoArea, geoMercatorRaw as d3_geoMercatorRaw } from 'd3-geo';
import { json as d3_json } from 'd3-fetch';
import { escape } from 'lodash';
import { t, localizer } from '../core/localizer';
import { geoExtent, geoSphericalDistance } from '../geo';
@@ -68,19 +69,19 @@ export function rendererBackgroundSource(data) {
source.name = function() {
var id_safe = source.id.replace(/\./g, '<TX_DOT>');
return t('imagery.' + id_safe + '.name', { default: _name });
return t('imagery.' + id_safe + '.name', { default: escape(_name) });
};
source.label = function() {
var id_safe = source.id.replace(/\./g, '<TX_DOT>');
return t.html('imagery.' + id_safe + '.name', { default: _name });
return t.html('imagery.' + id_safe + '.name', { default: escape(_name) });
};
source.description = function() {
var id_safe = source.id.replace(/\./g, '<TX_DOT>');
return t.html('imagery.' + id_safe + '.description', { default: _description });
return t.html('imagery.' + id_safe + '.description', { default: escape(_description) });
};
modules/renderer/tile_layer.js
+6 -4
View File
@@ -238,7 +238,7 @@ export function rendererTileLayer(context) {
debug
.selectAll('.tile-label-debug-coord')
.html(function(d) { return d[2] + ' / ' + d[0] + ' / ' + d[1]; });
.text(function(d) { return d[2] + ' / ' + d[0] + ' / ' + d[1]; });
debug
.selectAll('.tile-label-debug-vintage')
@@ -246,9 +246,11 @@ export function rendererTileLayer(context) {
var span = d3_select(this);
var center = context.projection.invert(tileCenter(d));
_source.getMetadata(center, d, function(err, result) {
span.html((result && result.vintage && result.vintage.range) ||
t('info_panels.background.vintage') + ': ' + t('info_panels.background.unknown')
);
if (result && result.vintage && result.vintage.range) {
span.text(result.vintage.range);
} else {
span.html(t.html('info_panels.background.vintage') + ': ' + t.html('info_panels.background.unknown'));
}
});
});
}
modules/services/kartaview.js
+10 -10
View File
@@ -276,22 +276,22 @@ export default {
controlsEnter
.append('button')
.on('click.back', step(-1))
.html('◄');
.text('◄');
controlsEnter
.append('button')
.on('click.rotate-ccw', rotate(-90))
.html('⤿');
.text('⤿');
controlsEnter
.append('button')
.on('click.rotate-cw', rotate(90))
.html('⤾');
.text('⤾');
controlsEnter
.append('button')
.on('click.forward', step(1))
.html('►');
.text('►');
wrapEnter
.append('div')
@@ -428,7 +428,7 @@ export default {
var wrap = context.container().select('.photoviewer .kartaview-wrapper');
var imageWrap = wrap.selectAll('.kartaview-image-wrap');
var attribution = wrap.selectAll('.photo-attribution').html('');
var attribution = wrap.selectAll('.photo-attribution').text('');
wrap
.transition()
@@ -455,22 +455,22 @@ export default {
.attr('class', 'captured_by')
.attr('target', '_blank')
.attr('href', 'https://kartaview.org/user/' + encodeURIComponent(d.captured_by))
.html('@' + d.captured_by);
.text('@' + d.captured_by);
attribution
.append('span')
.html('|');
.text('|');
}
if (d.captured_at) {
attribution
.append('span')
.attr('class', 'captured_at')
.html(localeDateString(d.captured_at));
.text(localeDateString(d.captured_at));
attribution
.append('span')
.html('|');
.text('|');
}
attribution
@@ -478,7 +478,7 @@ export default {
.attr('class', 'image-link')
.attr('target', '_blank')
.attr('href', 'https://kartaview.org/details/' + d.sequence_id + '/' + d.sequence_index)
.html('kartaview.org');
.text('kartaview.org');
}
return this;
modules/services/osm.js
+1 -1
View File
@@ -589,7 +589,7 @@ export default {
userURL: function(username) {
return urlroot + '/user/' + username;
return urlroot + '/user/' + encodeURIComponent(username);
},
modules/services/streetside.js
+8 -8
View File
@@ -544,12 +544,12 @@ export default {
controlsEnter
.append('button')
.on('click.back', step(-1))
.html('◄');
.text('◄');
controlsEnter
.append('button')
.on('click.forward', step(1))
.html('►');
.text('►');
// create working canvas for stitching together images
@@ -794,7 +794,7 @@ export default {
label
.append('span')
.html(t.html('streetside.hires'));
.call(t.append('streetside.hires'));
let captureInfo = line1
@@ -810,18 +810,18 @@ export default {
.attr('class', 'captured_by')
.attr('target', '_blank')
.attr('href', 'https://www.microsoft.com/en-us/maps/streetside')
.html('©' + yyyy + ' Microsoft');
.text('©' + yyyy + ' Microsoft');
captureInfo
.append('span')
.html('|');
.text('|');
}
if (d.captured_at) {
captureInfo
.append('span')
.attr('class', 'captured_at')
.html(localeTimestamp(d.captured_at));
.text(localeTimestamp(d.captured_at));
}
// Add image links
@@ -835,7 +835,7 @@ export default {
.attr('target', '_blank')
.attr('href', 'https://www.bing.com/maps?cp=' + d.loc[1] + '~' + d.loc[0] +
'&lvl=17&dir=' + d.ca + '&style=x&v=2&sV=1')
.html(t.html('streetside.view_on_bing'));
.call(t.append('streetside.view_on_bing'));
line2
.append('a')
@@ -843,7 +843,7 @@ export default {
.attr('target', '_blank')
.attr('href', 'https://www.bing.com/maps/privacyreport/streetsideprivacyreport?bubbleid=' +
encodeURIComponent(d.key) + '&focus=photo&lat=' + d.loc[1] + '&lng=' + d.loc[0] + '&z=17')
.html(t.html('streetside.report'));
.call(t.append('streetside.report'));
let bubbleIdQuadKey = d.key.toString(4);
modules/ui/account.js
+1 -1
View File
@@ -49,7 +49,7 @@ export function uiAccount(context) {
logoutLink.append('a')
.attr('class', 'logout')
.attr('href', '#')
.html(t.html('logout'))
.call(t.append('logout'))
.on('click.logout', function(d3_event) {
d3_event.preventDefault();
osm.logout();
modules/ui/attribution.js
+2 -2
View File
@@ -56,7 +56,7 @@ export function uiAttribution(context) {
attribution
.append('span')
.attr('class', 'attribution-text')
.html(terms_text);
.text(terms_text);
})
.merge(attributions);
@@ -76,7 +76,7 @@ export function uiAttribution(context) {
.merge(copyright);
copyright
.html(String);
.text(String);
}
modules/ui/changeset_editor.js
+1 -1
View File
@@ -107,7 +107,7 @@ export function uiChangesetEditor(context) {
.call(svgIcon('#iD-icon-alert', 'inline'))
.attr('href', t('commit.google_warning_link'))
.append('span')
.html(t.html('commit.google_warning'));
.call(t.append('commit.google_warning'));
commentEnter
.transition()
modules/ui/combobox.js
+1 -1
View File
@@ -384,7 +384,7 @@ export function uiCombobox(context, klass) {
return 'combobox-option ' + (d.klass || '');
})
.attr('title', function(d) { return d.title; })
.html(function(d) { return d.display || d.value; })
.text(function(d) { return d.display || d.value; })
.on('mouseenter', _mouseEnterHandler)
.on('mouseleave', _mouseLeaveHandler)
.merge(options)
modules/ui/commit.js
+7 -7
View File
@@ -221,7 +221,7 @@ export function uiCommit(context) {
headerTitle
.append('div')
.append('h3')
.html(t.html('commit.title'));
.call(t.append('commit.title'));
headerTitle
.append('button')
@@ -279,7 +279,7 @@ export function uiCommit(context) {
prose = prose.enter()
.append('p')
.attr('class', 'commit-info')
.html(t.html('commit.upload_explanation'))
.call(t.append('commit.upload_explanation'))
.merge(prose);
// always check if this has changed, but only update prose.html()
@@ -302,12 +302,12 @@ export function uiCommit(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('commit.upload_explanation_with_user', { user: userLink.html() }));
.html(t.html('commit.upload_explanation_with_user', { user: { html: userLink.html() } }));
});
@@ -338,7 +338,7 @@ export function uiCommit(context) {
labelEnter
.append('span')
.html(t.html('commit.request_review'));
.call(t.append('commit.request_review'));
// Update
requestReview = requestReview
@@ -363,7 +363,7 @@ export function uiCommit(context) {
.attr('class', 'secondary-action button cancel-button')
.append('span')
.attr('class', 'label')
.html(t.html('commit.cancel'));
.call(t.append('commit.cancel'));
var uploadButton = buttonEnter
.append('button')
@@ -371,7 +371,7 @@ export function uiCommit(context) {
uploadButton.append('span')
.attr('class', 'label')
.html(t.html('commit.save'));
.call(t.append('commit.save'));
var uploadBlockerTooltipText = getUploadBlockerMessage();
modules/ui/confirm.js
+1 -1
View File
@@ -27,7 +27,7 @@ export function uiConfirm(selection) {
.on('click.confirm', function() {
modalSelection.remove();
})
.html(t.html('confirm.okay'))
.call(t.append('confirm.okay'))
.node()
.focus();
modules/ui/conflicts.js
+9 -9
View File
@@ -65,7 +65,7 @@ export function uiConflicts(context) {
headerEnter
.append('h3')
.html(t.html('save.conflict.header'));
.call(t.append('save.conflict.header'));
var bodyEnter = selection.selectAll('.body')
.data([0])
@@ -76,7 +76,7 @@ export function uiConflicts(context) {
var conflictsHelpEnter = bodyEnter
.append('div')
.attr('class', 'conflicts-help')
.html(t.html('save.conflict.help'));
.call(t.append('save.conflict.help'));
// Download changes link
@@ -109,7 +109,7 @@ export function uiConflicts(context) {
linkEnter
.call(svgIcon('#iD-icon-load', 'inline'))
.append('span')
.html(t.html('save.conflict.download_changes'));
.call(t.append('save.conflict.download_changes'));
bodyEnter
@@ -122,7 +122,7 @@ export function uiConflicts(context) {
.attr('class', 'conflicts-done')
.attr('opacity', 0)
.style('display', 'none')
.html(t.html('save.conflict.done'));
.call(t.append('save.conflict.done'));
var buttonsEnter = bodyEnter
.append('div')
@@ -132,13 +132,13 @@ export function uiConflicts(context) {
.append('button')
.attr('disabled', _conflictList.length > 1)
.attr('class', 'action conflicts-button col6')
.html(t.html('save.title'))
.call(t.append('save.title'))
.on('click.try_again', tryAgain);
buttonsEnter
.append('button')
.attr('class', 'secondary-action conflicts-button col6')
.html(t.html('confirm.cancel'))
.call(t.append('confirm.cancel'))
.on('click.cancel', cancel);
}
@@ -176,13 +176,13 @@ export function uiConflicts(context) {
conflictEnter
.append('h4')
.attr('class', 'conflict-count')
.html(t.html('save.conflict.count', { num: index + 1, total: _conflictList.length }));
.call(t.append('save.conflict.count', { num: index + 1, total: _conflictList.length }));
conflictEnter
.append('a')
.attr('class', 'conflict-description')
.attr('href', '#')
.html(function(d) { return d.name; })
.text(function(d) { return d.name; })
.on('click', function(d3_event, d) {
d3_event.preventDefault();
zoomToEntity(d.id);
@@ -264,7 +264,7 @@ export function uiConflicts(context) {
labelEnter
.append('span')
.html(function(d) { return d.text; });
.text(function(d) { return d.text; });
// update
choicesEnter
modules/ui/contributors.js
+4 -4
View File
@@ -39,7 +39,7 @@ export function uiContributors(context) {
.attr('class', 'user-link')
.attr('href', function(d) { return osm.userURL(d); })
.attr('target', '_blank')
.html(String);
.text(String);
if (u.length > limit) {
var count = d3_select(document.createElement('span'));
@@ -51,14 +51,14 @@ export function uiContributors(context) {
.attr('href', function() {
return osm.changesetsURL(context.map().center(), context.map().zoom());
})
.html(othersNum);
.text(othersNum);
wrap.append('span')
.html(t.html('contributors.truncated_list', { n: othersNum, users: userList.html(), count: count.html() }));
.html(t.html('contributors.truncated_list', { n: othersNum, users: { html: userList.html() }, count: { html: count.html() } }));
} else {
wrap.append('span')
.html(t.html('contributors.list', { users: userList.html() }));
.html(t.html('contributors.list', { users: { html: userList.html() } }));
}
if (!u.length) {
modules/ui/data_editor.js
+1 -1
View File
@@ -33,7 +33,7 @@ export function uiDataEditor(context) {
headerEnter
.append('h3')
.html(t.html('map_data.title'));
.call(t.append('map_data.title'));
var body = selection.selectAll('.body')
modules/ui/data_header.js
+1 -1
View File
@@ -32,7 +32,7 @@ export function uiDataHeader() {
headerEnter
.append('div')
.attr('class', 'data-header-label')
.html(t.html('map_data.layers.custom.title'));
.call(t.append('map_data.layers.custom.title'));
}
modules/ui/feature_info.js
+2 -2
View File
@@ -9,7 +9,7 @@ export function uiFeatureInfo(context) {
var hiddenList = features.hidden().map(function(k) {
if (stats[k]) {
count += stats[k];
return t('inspector.title_count', { title: t.html('feature.' + k + '.description'), count: stats[k] });
return t.html('inspector.title_count', { title: { html: t.html('feature.' + k + '.description') }, count: stats[k] });
}
return null;
}).filter(Boolean);
@@ -26,7 +26,7 @@ export function uiFeatureInfo(context) {
selection.append('a')
.attr('class', 'chip')
.attr('href', '#')
.html(t.html('feature_info.hidden_warning', { count: count }))
.call(t.append('feature_info.hidden_warning', { count: count }))
.call(tooltipBehavior)
.on('click', function(d3_event) {
tooltipBehavior.hide();
modules/ui/feature_list.js
+6 -5
View File
@@ -34,7 +34,7 @@ export function uiFeatureList(context) {
header
.append('h3')
.html(t.html('inspector.feature_list'));
.call(t.append('inspector.feature_list'));
var searchWrap = selection
.append('div')
@@ -255,7 +255,8 @@ export function uiFeatureList(context) {
.attr('class', 'entity-name');
list.selectAll('.no-results-item .entity-name')
.html(t.html('geocoder.no_results_worldwide'));
.html('')
.call(t.append('geocoder.no_results_worldwide'));
if (services.geocoder) {
list.selectAll('.geocode-item')
@@ -268,7 +269,7 @@ export function uiFeatureList(context) {
.attr('class', 'label')
.append('span')
.attr('class', 'entity-name')
.html(t.html('geocoder.search'));
.call(t.append('geocoder.search'));
}
list.selectAll('.no-results-item')
@@ -304,12 +305,12 @@ export function uiFeatureList(context) {
label
.append('span')
.attr('class', 'entity-type')
.html(function(d) { return d.type; });
.text(function(d) { return d.type; });
label
.append('span')
.attr('class', 'entity-name')
.html(function(d) { return d.name; });
.text(function(d) { return d.name; });
enter
.style('opacity', 0)
modules/ui/field_help.js
+10 -10
View File
@@ -54,15 +54,15 @@ export function uiFieldHelp(context, fieldName) {
var fieldHelpHeadings = {};
var replacements = {
distField: t.html('restriction.controls.distance'),
viaField: t.html('restriction.controls.via'),
fromShadow: icon('#iD-turn-shadow', 'inline shadow from'),
allowShadow: icon('#iD-turn-shadow', 'inline shadow allow'),
restrictShadow: icon('#iD-turn-shadow', 'inline shadow restrict'),
onlyShadow: icon('#iD-turn-shadow', 'inline shadow only'),
allowTurn: icon('#iD-turn-yes', 'inline turn'),
restrictTurn: icon('#iD-turn-no', 'inline turn'),
onlyTurn: icon('#iD-turn-only', 'inline turn')
distField: { html: t.html('restriction.controls.distance') },
viaField: { html: t.html('restriction.controls.via') },
fromShadow: { html: icon('#iD-turn-shadow', 'inline shadow from') },
allowShadow: { html: icon('#iD-turn-shadow', 'inline shadow allow') },
restrictShadow: { html: icon('#iD-turn-shadow', 'inline shadow restrict') },
onlyShadow: { html: icon('#iD-turn-shadow', 'inline shadow only') },
allowTurn: { html: icon('#iD-turn-yes', 'inline turn') },
restrictTurn: { html: icon('#iD-turn-no', 'inline turn') },
onlyTurn: { html: icon('#iD-turn-only', 'inline turn') }
};
@@ -196,7 +196,7 @@ export function uiFieldHelp(context, fieldName) {
titleEnter
.append('h2')
.attr('class', ((localizer.textDirection() === 'rtl') ? 'fr' : 'fl'))
.html(t.html('help.field.' + fieldName + '.title'));
.call(t.append('help.field.' + fieldName + '.title'));
titleEnter
.append('button')
modules/ui/fields/check.js
+1 -1
View File
@@ -83,7 +83,7 @@ export function uiFieldCheck(field, context) {
var icon = pseudoDirection ? '#iD-icon-forward' : '#iD-icon-backward';
selection.selectAll('.reverser-span')
.html(t.html('inspector.check.reverser'))
.call(t.append('inspector.check.reverser'))
.call(svgIcon(icon, 'inline'));
return selection;
modules/ui/fields/combo.js
+2 -2
View File
@@ -527,13 +527,13 @@ export function uiFieldCombo(field, context) {
}
chips.select('span')
.html(function(d) { return d.value; });
.text(function(d) { return d.value; });
chips.select('a')
.attr('href', '#')
.on('click', removeMultikey)
.attr('class', 'remove')
.html('×');
.text('×');
} else {
var isMixed = Array.isArray(tags[field.key]);
modules/ui/fields/lanes.js
+3 -3
View File
@@ -77,7 +77,7 @@ export function uiFieldLanes(field, context) {
.append('text')
.attr('y', 40)
.attr('x', 14)
.html('▲');
.text('▲');
enter
.append('g')
@@ -85,7 +85,7 @@ export function uiFieldLanes(field, context) {
.append('text')
.attr('y', 40)
.attr('x', 14)
.html('▲▼');
.text('▲▼');
enter
.append('g')
@@ -93,7 +93,7 @@ export function uiFieldLanes(field, context) {
.append('text')
.attr('y', 40)
.attr('x', 14)
.html('▼');
.text('▼');
lane = lane
modules/ui/fields/localized.js
+1 -1
View File
@@ -373,7 +373,7 @@ export function uiFieldLocalized(field, context) {
text
.append('span')
.attr('class', 'label-textvalue')
.html(t.html('translate.localized_translation_label'));
.call(t.append('translate.localized_translation_label'));
text
.append('span')
modules/ui/fields/radio.js
+4 -4
View File
@@ -129,7 +129,7 @@ export function uiFieldRadio(field, context) {
.append('span')
.attr('class', 'label structure-label-type')
.attr('for', 'preset-input-' + selected)
.html(t.html('inspector.radio.structure.type'));
.call(t.append('inspector.radio.structure.type'));
typeEnter
.append('div')
@@ -174,7 +174,7 @@ export function uiFieldRadio(field, context) {
.append('span')
.attr('class', 'label structure-label-layer')
.attr('for', 'preset-input-layer')
.html(t.html('inspector.radio.structure.layer'));
.call(t.append('inspector.radio.structure.layer'));
layerEnter
.append('div')
@@ -302,9 +302,9 @@ export function uiFieldRadio(field, context) {
var selection = radios.filter(function() { return this.checked; });
if (selection.empty()) {
placeholder.html(t.html('inspector.none'));
placeholder.call(t.append('inspector.none'));
} else {
placeholder.html(selection.attr('value'));
placeholder.text(selection.attr('value'));
_oldType[selection.datum()] = tags[selection.datum()];
}
modules/ui/fields/restrictions.js
+27 -20
View File
@@ -124,7 +124,7 @@ export function uiFieldRestrictions(field, context) {
distControlEnter
.append('span')
.attr('class', 'restriction-control-label restriction-distance-label')
.html(t.html('restriction.controls.distance') + ':');
.call(t.append('restriction.controls.distance', { suffix: ':' }));
distControlEnter
.append('input')
@@ -151,7 +151,7 @@ export function uiFieldRestrictions(field, context) {
});
selection.selectAll('.restriction-distance-text')
.html(displayMaxDistance(_maxDistance));
.call(displayMaxDistance(_maxDistance));
var viaControl = selection.selectAll('.restriction-via-way')
@@ -167,7 +167,7 @@ export function uiFieldRestrictions(field, context) {
viaControlEnter
.append('span')
.attr('class', 'restriction-control-label restriction-via-way-label')
.html(t.html('restriction.controls.via') + ':');
.call(t.append('restriction.controls.via', { suffix: ':' }));
viaControlEnter
.append('input')
@@ -193,7 +193,7 @@ export function uiFieldRestrictions(field, context) {
});
selection.selectAll('.restriction-via-way-text')
.html(displayMaxVia(_maxViaWay));
.call(displayMaxVia(_maxViaWay));
}
@@ -463,7 +463,7 @@ export function uiFieldRestrictions(field, context) {
var placeholders = {};
['from', 'via', 'to'].forEach(function(k) {
placeholders[k] = '<span class="qualifier">' + t('restriction.help.' + k) + '</span>';
placeholders[k] = { html: '<span class="qualifier">' + t('restriction.help.' + k) + '</span>' };
});
var entity = datum && datum.properties && datum.properties.entity;
@@ -553,7 +553,7 @@ export function uiFieldRestrictions(field, context) {
if (!indirect) {
help
.append('div') // Click for "No Right Turn"
.html(t.html('restriction.help.toggle', { turn: nextText.trim() }));
.html(t.html('restriction.help.toggle', { turn: { html: nextText.trim() } }));
}
highlightPathsFrom(null);
@@ -589,26 +589,33 @@ export function uiFieldRestrictions(field, context) {
function displayMaxDistance(maxDist) {
var isImperial = !localizer.usesMetric();
var opts;
return selection => {
var isImperial = !localizer.usesMetric();
var opts;
if (isImperial) {
var distToFeet = { // imprecise conversion for prettier display
20: 70, 25: 85, 30: 100, 35: 115, 40: 130, 45: 145, 50: 160
}[maxDist];
opts = { distance: t('units.feet', { quantity: distToFeet }) };
} else {
opts = { distance: t('units.meters', { quantity: maxDist }) };
}
if (isImperial) {
var distToFeet = { // imprecise conversion for prettier display
20: 70, 25: 85, 30: 100, 35: 115, 40: 130, 45: 145, 50: 160
}[maxDist];
opts = { distance: t('units.feet', { quantity: distToFeet }) };
} else {
opts = { distance: t('units.meters', { quantity: maxDist }) };
}
return t.html('restriction.controls.distance_up_to', opts);
return selection
.html('')
.call(t.append('restriction.controls.distance_up_to', opts));
};
}
function displayMaxVia(maxVia) {
return maxVia === 0 ? t.html('restriction.controls.via_node_only')
: maxVia === 1 ? t.html('restriction.controls.via_up_to_one')
: t.html('restriction.controls.via_up_to_two');
return selection => {
selection = selection.html('');
return maxVia === 0 ? selection.call(t.append('restriction.controls.via_node_only'))
: maxVia === 1 ? selection.call(t.append('restriction.controls.via_up_to_one'))
: selection.call(t.append('restriction.controls.via_up_to_two'));
};
}
modules/ui/form_fields.js
+1 -1
View File
@@ -84,7 +84,7 @@ export function uiFormFields(context) {
moreEnter
.append('span')
.html(t.html('inspector.add_fields'));
.call(t.append('inspector.add_fields'));
more = moreEnter
.merge(more);
modules/ui/improveOSM_comments.js
+2 -2
View File
@@ -55,7 +55,7 @@ export function uiImproveOsmComments() {
.attr('target', '_blank');
}
selection
.html(d => d.username);
.text(d => d.username);
});
metadataEnter
@@ -67,7 +67,7 @@ export function uiImproveOsmComments() {
.append('div')
.attr('class', 'comment-text')
.append('p')
.html(d => d.text);
.text(d => d.text);
})
.catch(err => {
console.log(err); // eslint-disable-line no-console
modules/ui/improveOSM_details.js
+2 -2
View File
@@ -42,12 +42,12 @@ export function uiImproveOsmDetails(context) {
descriptionEnter
.append('h4')
.html(t.html('QA.keepRight.detail_description'));
.call(t.append('QA.keepRight.detail_description'));
descriptionEnter
.append('div')
.attr('class', 'qa-details-description-text')
.html(issueDetail);
.text(issueDetail);
// If there are entity links in the error message..
let relatedEntities = [];
modules/ui/improveOSM_editor.js
+3 -3
View File
@@ -36,7 +36,7 @@ export function uiImproveOsmEditor(context) {
headerEnter
.append('h3')
.html(t.html('QA.improveOSM.title'));
.call(t.append('QA.improveOSM.title'));
let body = selection.selectAll('.body')
.data([0]);
@@ -80,7 +80,7 @@ export function uiImproveOsmEditor(context) {
saveSectionEnter
.append('h4')
.attr('class', '.qa-save-header')
.html(t.html('note.newComment'));
.call(t.append('note.newComment'));
saveSectionEnter
.append('textarea')
@@ -135,7 +135,7 @@ export function uiImproveOsmEditor(context) {
buttonEnter
.append('button')
.attr('class', 'button comment-button action')
.html(t.html('QA.keepRight.save_comment'));
.call(t.append('QA.keepRight.save_comment'));
buttonEnter
.append('button')
modules/ui/improveOSM_header.js
+1 -1
View File
@@ -62,7 +62,7 @@ export function uiImproveOsmHeader() {
headerEnter
.append('div')
.attr('class', 'qa-header-label')
.html(issueTitle);
.text(issueTitle);
}
improveOsmHeader.issue = function(val) {
modules/ui/intro/helper.js
+3
View File
@@ -146,6 +146,9 @@ export function helpHtml(id, replacements) {
help: t.html('help.title'),
ok: t.html('intro.ok')
};
for (var key in helpStringReplacements) {
helpStringReplacements[key] = { html: helpStringReplacements[key] };
}
}
var reps;
modules/ui/intro/start_editing.js
+1 -1
View File
@@ -72,7 +72,7 @@ export function uiIntroStartEditing(context, reveal) {
startbutton
.append('h2')
.html(t.html('intro.startediting.start'));
.call(t.append('intro.startediting.start'));
dispatch.call('startEditing');
}
modules/ui/issues_info.js
+1 -1
View File
@@ -83,7 +83,7 @@ export function uiIssuesInfo(context) {
enter.merge(chips)
.selectAll('span.count')
.html(function(d) {
.text(function(d) {
return d.count.toString();
});
}
modules/ui/keepRight_details.js
+1 -1
View File
@@ -47,7 +47,7 @@ export function uiKeepRightDetails(context) {
descriptionEnter
.append('h4')
.html(t.html('QA.keepRight.detail_description'));
.call(t.append('QA.keepRight.detail_description'));
descriptionEnter
.append('div')
modules/ui/keepRight_editor.js
+3 -3
View File
@@ -35,7 +35,7 @@ export function uiKeepRightEditor(context) {
headerEnter
.append('h3')
.html(t.html('QA.keepRight.title'));
.call(t.append('QA.keepRight.title'));
let body = selection.selectAll('.body')
@@ -90,7 +90,7 @@ export function uiKeepRightEditor(context) {
saveSectionEnter
.append('h4')
.attr('class', '.qa-save-header')
.html(t.html('QA.keepRight.comment'));
.call(t.append('QA.keepRight.comment'));
saveSectionEnter
.append('textarea')
@@ -146,7 +146,7 @@ export function uiKeepRightEditor(context) {
buttonEnter
.append('button')
.attr('class', 'button comment-button action')
.html(t.html('QA.keepRight.save_comment'));
.call(t.append('QA.keepRight.save_comment'));
buttonEnter
.append('button')
modules/ui/note_comments.js
+6 -3
View File
@@ -53,15 +53,18 @@ export function uiNoteComments() {
.attr('href', osm.userURL(d.user))
.attr('target', '_blank');
}
selection
.html(function(d) { return d.user || t.html('note.anonymous'); });
if (d.user) {
selection.text(d.user);
} else {
selection.call(t.append('note.anonymous'));
}
});
metadataEnter
.append('div')
.attr('class', 'comment-date')
.html(function(d) {
return t('note.status.' + d.action, { when: localeDateString(d.date) });
return t.html('note.status.' + d.action, { when: localeDateString(d.date) });
});
mainEnter
modules/ui/note_editor.js
+11 -11
View File
@@ -53,7 +53,7 @@ export function uiNoteEditor(context) {
headerEnter
.append('h3')
.html(t.html('note.title'));
.call(t.append('note.title'));
var body = selection.selectAll('.body')
@@ -148,7 +148,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
@@ -256,14 +256,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();
@@ -284,7 +284,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) {
@@ -302,12 +302,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() } }));
});
}
@@ -333,12 +333,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
@@ -348,7 +348,7 @@ export function uiNoteEditor(context) {
buttonEnter
.append('button')
.attr('class', 'button comment-button action')
.html(t.html('note.comment'));
.call(t.append('note.comment'));
}
@@ -368,7 +368,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);
modules/ui/note_header.js
+3 -3
View File
@@ -49,9 +49,9 @@ export function uiNoteHeader() {
.append('div')
.attr('class', 'note-header-label')
.html(function(d) {
if (_note.isNew()) { return t('note.new'); }
return t('note.note') + ' ' + d.id + ' ' +
(d.status === 'closed' ? t('note.closed') : '');
if (_note.isNew()) { return t.html('note.new'); }
return t.html('note.note') + ' ' + d.id + ' ' +
(d.status === 'closed' ? t.html('note.closed') : '');
});
}
modules/ui/note_report.js
+1 -1
View File
@@ -30,7 +30,7 @@ export function uiNoteReport() {
linkEnter
.append('span')
.html(t.html('note.report'));
.call(t.append('note.report'));
}
modules/ui/notice.js
+1 -1
View File
@@ -26,7 +26,7 @@ export function uiNotice(context) {
.call(svgIcon('#iD-icon-plus', 'pre-text'))
.append('span')
.attr('class', 'label')
.html(t.html('zoom_in_edit'));
.call(t.append('zoom_in_edit'));
function disableTooHigh() {
modules/ui/osmose_details.js
+6 -6
View File
@@ -44,7 +44,7 @@ export function uiOsmoseDetails(context) {
div
.append('h4')
.html(t.html('QA.keepRight.detail_description'));
.call(t.append('QA.keepRight.detail_description'));
div
.append('p')
@@ -72,7 +72,7 @@ export function uiOsmoseDetails(context) {
div
.append('h4')
.html(t.html('QA.osmose.fix_title'));
.call(t.append('QA.osmose.fix_title'));
div
.append('p')
@@ -90,7 +90,7 @@ export function uiOsmoseDetails(context) {
div
.append('h4')
.html(t.html('QA.osmose.trap_title'));
.call(t.append('QA.osmose.trap_title'));
div
.append('p')
@@ -117,7 +117,7 @@ export function uiOsmoseDetails(context) {
if (d.detail) {
detailsDiv
.append('h4')
.html(t.html('QA.osmose.detail_title'));
.call(t.append('QA.osmose.detail_title'));
detailsDiv
.append('p')
@@ -130,7 +130,7 @@ export function uiOsmoseDetails(context) {
// Create list of linked issue elements
elemsDiv
.append('h4')
.html(t.html('QA.osmose.elems_title'));
.call(t.append('QA.osmose.elems_title'));
elemsDiv
.append('ul').selectAll('li')
@@ -140,7 +140,7 @@ export function uiOsmoseDetails(context) {
.append('a')
.attr('href', '#')
.attr('class', 'error_entity_link')
.html(d => d)
.text(d => d)
.each(function() {
const link = d3_select(this);
const entityID = this.textContent;
modules/ui/osmose_editor.js
+3 -3
View File
@@ -35,7 +35,7 @@ export function uiOsmoseEditor(context) {
headerEnter
.append('h3')
.html(t.html('QA.osmose.title'));
.call(t.append('QA.osmose.title'));
let body = selection.selectAll('.body')
.data([0]);
@@ -117,7 +117,7 @@ export function uiOsmoseEditor(context) {
.merge(buttonEnter);
buttonSection.select('.close-button')
.html(t.html('QA.keepRight.close'))
.call(t.append('QA.keepRight.close'))
.on('click.close', function(d3_event, d) {
this.blur(); // avoid keeping focus on the button - #4641
const qaService = services.osmose;
@@ -128,7 +128,7 @@ export function uiOsmoseEditor(context) {
});
buttonSection.select('.ignore-button')
.html(t.html('QA.keepRight.ignore'))
.call(t.append('QA.keepRight.ignore'))
.on('click.ignore', function(d3_event, d) {
this.blur(); // avoid keeping focus on the button - #4641
const qaService = services.osmose;
modules/ui/osmose_header.js
+1 -1
View File
@@ -65,7 +65,7 @@ export function uiOsmoseHeader() {
headerEnter
.append('div')
.attr('class', 'qa-header-label')
.html(issueTitle);
.text(issueTitle);
}
osmoseHeader.issue = function(val) {
modules/ui/panels/background.js
+7 -7
View File
@@ -43,10 +43,10 @@ export function uiPanelBackground(context) {
.append('li')
.attr('class', 'background-info-list-' + k)
.classed('hide', !_metadata[k])
.html(t.html('info_panels.background.' + k) + ':')
.call(t.append('info_panels.background.' + k, { suffix: ':' }))
.append('span')
.attr('class', 'background-info-span-' + k)
.html(_metadata[k]);
.text(_metadata[k]);
});
debouncedGetMetadata(selection);
@@ -55,7 +55,7 @@ export function uiPanelBackground(context) {
selection
.append('a')
.html(t.html('info_panels.background.' + toggleTiles))
.call(t.append('info_panels.background.' + toggleTiles))
.attr('href', '#')
.attr('class', 'button button-toggle-tiles')
.on('click', function(d3_event) {
@@ -71,7 +71,7 @@ export function uiPanelBackground(context) {
var toggleVintage = showsVintage ? 'hide_vintage' : 'show_vintage';
selection
.append('a')
.html(t.html('info_panels.background.' + toggleVintage))
.call(t.append('info_panels.background.' + toggleVintage))
.attr('href', '#')
.attr('class', 'button button-toggle-vintage')
.on('click', function(d3_event) {
@@ -110,7 +110,7 @@ export function uiPanelBackground(context) {
selection.selectAll('.background-info-list-zoom')
.classed('hide', false)
.selectAll('.background-info-span-zoom')
.html(_metadata.zoom);
.text(_metadata.zoom);
if (!d || !d.length >= 3) return;
@@ -123,7 +123,7 @@ export function uiPanelBackground(context) {
selection.selectAll('.background-info-list-vintage')
.classed('hide', false)
.selectAll('.background-info-span-vintage')
.html(_metadata.vintage);
.text(_metadata.vintage);
// update other _metadata
_metadataKeys.forEach(function(k) {
@@ -133,7 +133,7 @@ export function uiPanelBackground(context) {
selection.selectAll('.background-info-list-' + k)
.classed('hide', !val)
.selectAll('.background-info-span-' + k)
.html(val);
.text(val);
});
});
}
modules/ui/panels/history.js
+37 -30
View File
@@ -21,14 +21,14 @@ export function uiPanelHistory(context) {
if (!userName) {
selection
.append('span')
.html(t.html('info_panels.history.unknown'));
.call(t.append('info_panels.history.unknown'));
return;
}
selection
.append('span')
.attr('class', 'user-name')
.html(userName);
.text(userName);
var links = selection
.append('div')
@@ -40,7 +40,7 @@ export function uiPanelHistory(context) {
.attr('class', 'user-osm-link')
.attr('href', osm.userURL(userName))
.attr('target', '_blank')
.html('OSM');
.text('OSM');
}
links
@@ -49,7 +49,7 @@ export function uiPanelHistory(context) {
.attr('href', 'https://hdyc.neis-one.org/?' + userName)
.attr('target', '_blank')
.attr('tabindex', -1)
.html('HDYC');
.text('HDYC');
}
@@ -57,14 +57,14 @@ export function uiPanelHistory(context) {
if (!changeset) {
selection
.append('span')
.html(t.html('info_panels.history.unknown'));
.call(t.append('info_panels.history.unknown'));
return;
}
selection
.append('span')
.attr('class', 'changeset-id')
.html(changeset);
.text(changeset);
var links = selection
.append('div')
@@ -76,7 +76,7 @@ export function uiPanelHistory(context) {
.attr('class', 'changeset-osm-link')
.attr('href', osm.changesetURL(changeset))
.attr('target', '_blank')
.html('OSM');
.text('OSM');
}
links
@@ -84,14 +84,14 @@ export function uiPanelHistory(context) {
.attr('class', 'changeset-osmcha-link')
.attr('href', 'https://osmcha.org/changesets/' + changeset)
.attr('target', '_blank')
.html('OSMCha');
.text('OSMCha');
links
.append('a')
.attr('class', 'changeset-achavi-link')
.attr('href', 'https://overpass-api.de/achavi/?changeset=' + changeset)
.attr('target', '_blank')
.html('Achavi');
.text('Achavi');
}
@@ -101,7 +101,7 @@ export function uiPanelHistory(context) {
var selected, note, entity;
if (selectedNoteID && osm) { // selected 1 note
selected = [ t('note.note') + ' ' + selectedNoteID ];
selected = [ t.html('note.note') + ' ' + selectedNoteID ];
note = osm.getNote(selectedNoteID);
} else { // selected 1..n entities
selected = context.selectedIDs()
@@ -115,10 +115,17 @@ export function uiPanelHistory(context) {
selection.html('');
selection
.append('h4')
.attr('class', 'history-heading')
.html(singular || t.html('info_panels.selected', { n: selected.length }));
if (singular) {
selection
.append('h4')
.attr('class', 'history-heading')
.html(singular);
} else {
selection
.append('h4')
.attr('class', 'history-heading')
.call(t.append('info_panels.selected', { n: selected.length }));
}
if (!singular) return;
@@ -134,7 +141,7 @@ export function uiPanelHistory(context) {
if (!note || note.isNew()) {
selection
.append('div')
.html(t.html('info_panels.history.note_no_history'));
.call(t.append('info_panels.history.note_no_history'));
return;
}
@@ -143,20 +150,20 @@ export function uiPanelHistory(context) {
list
.append('li')
.html(t.html('info_panels.history.note_comments') + ':')
.call(t.append('info_panels.history.note_comments', { suffix: ':' }))
.append('span')
.html(note.comments.length);
.text(note.comments.length);
if (note.comments.length) {
list
.append('li')
.html(t.html('info_panels.history.note_created_date') + ':')
.call(t.append('info_panels.history.note_created_date', { suffix: ':' }))
.append('span')
.html(displayTimestamp(note.comments[0].date));
.text(displayTimestamp(note.comments[0].date));
list
.append('li')
.html(t.html('info_panels.history.note_created_user') + ':')
.call(t.append('info_panels.history.note_created_user', { suffix: ':' }))
.call(displayUser, note.comments[0].user);
}
@@ -168,7 +175,7 @@ export function uiPanelHistory(context) {
.attr('href', osm.noteURL(note))
.call(svgIcon('#iD-icon-out-link', 'inline'))
.append('span')
.html(t.html('info_panels.history.note_link_text'));
.call(t.append('info_panels.history.note_link_text'));
}
}
@@ -177,7 +184,7 @@ export function uiPanelHistory(context) {
if (!entity || entity.isNew()) {
selection
.append('div')
.html(t.html('info_panels.history.no_history'));
.call(t.append('info_panels.history.no_history'));
return;
}
@@ -192,7 +199,7 @@ export function uiPanelHistory(context) {
.attr('href', osm.historyURL(entity))
.attr('target', '_blank')
.attr('title', t('info_panels.history.link_text'))
.html('OSM');
.text('OSM');
}
links
.append('a')
@@ -200,31 +207,31 @@ export function uiPanelHistory(context) {
.attr('href', 'https://pewu.github.io/osm-history/#/' + entity.type + '/' + entity.osmId())
.attr('target', '_blank')
.attr('tabindex', -1)
.html('PeWu');
.text('PeWu');
var list = selection
.append('ul');
list
.append('li')
.html(t.html('info_panels.history.version') + ':')
.call(t.append('info_panels.history.version', { suffix: ':' }))
.append('span')
.html(entity.version);
.text(entity.version);
list
.append('li')
.html(t.html('info_panels.history.last_edit') + ':')
.call(t.append('info_panels.history.last_edit', { suffix: ':' }))
.append('span')
.html(displayTimestamp(entity.timestamp));
.text(displayTimestamp(entity.timestamp));
list
.append('li')
.html(t.html('info_panels.history.edited_by') + ':')
.call(t.append('info_panels.history.edited_by', { suffix: ':' }))
.call(displayUser, entity.user);
list
.append('li')
.html(t.html('info_panels.history.changeset') + ':')
.call(t.append('info_panels.history.changeset', { suffix: ':' }))
.call(displayChangeset, entity.changeset);
}
modules/ui/panels/location.js
+5 -5
View File
@@ -23,15 +23,15 @@ export function uiPanelLocation(context) {
list
.append('li')
.html(dmsCoordinatePair(coord))
.text(dmsCoordinatePair(coord))
.append('li')
.html(decimalCoordinatePair(coord));
.text(decimalCoordinatePair(coord));
// Location Info
selection
.append('div')
.attr('class', 'location-info')
.html(currLocation || ' ');
.text(currLocation || ' ');
debouncedGetLocation(selection, coord);
}
@@ -42,12 +42,12 @@ export function uiPanelLocation(context) {
if (!services.geocoder) {
currLocation = t('info_panels.location.unknown_location');
selection.selectAll('.location-info')
.html(currLocation);
.text(currLocation);
} else {
services.geocoder.reverse(coord, function(err, result) {
currLocation = result ? result.display_name : t('info_panels.location.unknown_location');
selection.selectAll('.location-info')
.html(currLocation);
.text(currLocation);
});
}
}
modules/ui/panels/measurement.js
+22 -22
View File
@@ -52,7 +52,7 @@ export function uiPanelMeasurement(context) {
if (selectedNoteID && osm) { // selected 1 note
var note = osm.getNote(selectedNoteID);
heading = t('note.note') + ' ' + selectedNoteID;
heading = t.html('note.note') + ' ' + selectedNoteID;
location = note.loc;
geometry = 'note';
@@ -65,7 +65,7 @@ export function uiPanelMeasurement(context) {
});
heading = selected.length === 1 ? selected[0].id :
t('info_panels.selected', { n: selected.length });
t.html('info_panels.selected', { n: selected.length });
if (selected.length) {
var extent = geoExtent();
@@ -129,80 +129,80 @@ export function uiPanelMeasurement(context) {
if (geometry) {
list
.append('li')
.html(t.html('info_panels.measurement.geometry') + ':')
.call(t.append('info_panels.measurement.geometry', { suffix: ':' }))
.append('span')
.html(
closed ? t('info_panels.measurement.closed_' + geometry) : t('geometry.' + geometry)
closed ? t.html('info_panels.measurement.closed_' + geometry) : t.html('geometry.' + geometry)
);
}
if (totalNodeCount) {
list
.append('li')
.html(t.html('info_panels.measurement.node_count') + ':')
.call(t.append('info_panels.measurement.node_count', { suffix: ':' }))
.append('span')
.html(totalNodeCount.toLocaleString(localeCode));
.text(totalNodeCount.toLocaleString(localeCode));
}
if (area) {
list
.append('li')
.html(t.html('info_panels.measurement.area') + ':')
.call(t.append('info_panels.measurement.area', { suffix: ':' }))
.append('span')
.html(displayArea(area, _isImperial));
.text(displayArea(area, _isImperial));
}
if (length) {
list
.append('li')
.html(t.html('info_panels.measurement.' + (closed ? 'perimeter' : 'length')) + ':')
.call(t.append('info_panels.measurement.' + (closed ? 'perimeter' : 'length'), { suffix: ':' }))
.append('span')
.html(displayLength(length, _isImperial));
.text(displayLength(length, _isImperial));
}
if (typeof distance === 'number') {
list
.append('li')
.html(t.html('info_panels.measurement.distance') + ':')
.call(t.append('info_panels.measurement.distance', { suffix: ':' }))
.append('span')
.html(displayLength(distance, _isImperial));
.text(displayLength(distance, _isImperial));
}
if (location) {
coordItem = list
.append('li')
.html(t.html('info_panels.measurement.location') + ':');
.call(t.append('info_panels.measurement.location', { suffix: ':' }));
coordItem.append('span')
.html(dmsCoordinatePair(location));
.text(dmsCoordinatePair(location));
coordItem.append('span')
.html(decimalCoordinatePair(location));
.text(decimalCoordinatePair(location));
}
if (centroid) {
coordItem = list
.append('li')
.html(t.html('info_panels.measurement.centroid') + ':');
.call(t.append('info_panels.measurement.centroid', { suffix: ':' }));
coordItem.append('span')
.html(dmsCoordinatePair(centroid));
.text(dmsCoordinatePair(centroid));
coordItem.append('span')
.html(decimalCoordinatePair(centroid));
.text(decimalCoordinatePair(centroid));
}
if (center) {
coordItem = list
.append('li')
.html(t.html('info_panels.measurement.center') + ':');
.call(t.append('info_panels.measurement.center', { suffix: ':' }));
coordItem.append('span')
.html(dmsCoordinatePair(center));
.text(dmsCoordinatePair(center));
coordItem.append('span')
.html(decimalCoordinatePair(center));
.text(decimalCoordinatePair(center));
}
if (length || area || typeof distance === 'number') {
var toggle = _isImperial ? 'imperial' : 'metric';
selection
.append('a')
.html(t.html('info_panels.measurement.' + toggle))
.call(t.append('info_panels.measurement.' + toggle))
.attr('href', '#')
.attr('class', 'button button-toggle-units')
.on('click', function(d3_event) {
modules/ui/panes/help.js
+2 -2
View File
@@ -382,7 +382,7 @@ export function uiPaneHelp(context) {
shortcuts
.append('div')
.html(t.html('shortcuts.title'));
.call(t.append('shortcuts.title'));
var walkthrough = toc
.append('li')
@@ -399,7 +399,7 @@ export function uiPaneHelp(context) {
walkthrough
.append('div')
.html(t.html('splash.walkthrough'));
.call(t.append('splash.walkthrough'));
var helpContent = content
modules/ui/preset_list.js
+3 -3
View File
@@ -35,7 +35,7 @@ export function uiPresetList(context) {
var message = messagewrap
.append('h3')
.html(t.html('inspector.choose'));
.call(t.append('inspector.choose'));
messagewrap
.append('button')
@@ -96,13 +96,13 @@ export function uiPresetList(context) {
var results, messageText;
if (value.length) {
results = presets.search(value, entityGeometries()[0], _currLoc);
messageText = t('inspector.results', {
messageText = t.html('inspector.results', {
n: results.collection.length,
search: value
});
} else {
results = presetManager.defaults(entityGeometries()[0], 36, !context.inIntro(), _currLoc);
messageText = t('inspector.choose');
messageText = t.html('inspector.choose');
}
list.call(drawList, results);
message.html(messageText);
modules/ui/restore.js
+4 -4
View File
@@ -17,13 +17,13 @@ export function uiRestore(context) {
.append('div')
.attr('class', 'modal-section')
.append('h3')
.html(t.html('restore.heading'));
.call(t.append('restore.heading'));
introModal
.append('div')
.attr('class','modal-section')
.append('p')
.html(t.html('restore.description'));
.call(t.append('restore.description'));
let buttonWrap = introModal
.append('div')
@@ -45,7 +45,7 @@ export function uiRestore(context) {
restore
.append('div')
.html(t.html('restore.restore'));
.call(t.append('restore.restore'));
let reset = buttonWrap
.append('button')
@@ -63,7 +63,7 @@ export function uiRestore(context) {
reset
.append('div')
.html(t.html('restore.reset'));
.call(t.append('restore.reset'));
restore.node().focus();
};
modules/ui/scale.js
+1 -1
View File
@@ -55,7 +55,7 @@ export function uiScale(context) {
selection.select('.scale-text')
.style(localizer.textDirection() === 'ltr' ? 'left' : 'right', (scale.px + 16) + 'px')
.html(scale.text);
.text(scale.text);
}
modules/ui/sections/background_display_options.js
+2 -2
View File
@@ -103,7 +103,7 @@ export function uiSectionBackgroundDisplayOptions(context) {
.append('a')
.attr('class', 'display-option-resetlink')
.attr('href', '#')
.html(t.html('background.reset_all'))
.call(t.append('background.reset_all'))
.on('click', function(d3_event) {
d3_event.preventDefault();
for (var i = 0; i < _sliders.length; i++) {
@@ -119,7 +119,7 @@ export function uiSectionBackgroundDisplayOptions(context) {
.property('value', function(d) { return _options[d]; });
container.selectAll('.display-option-value')
.html(function(d) { return Math.floor(_options[d] * 100) + '%'; });
.text(function(d) { return Math.floor(_options[d] * 100) + '%'; });
container.selectAll('.display-option-reset')
.classed('disabled', function(d) { return _options[d] === 1; });
modules/ui/sections/background_list.js
+4 -4
View File
@@ -70,7 +70,7 @@ export function uiSectionBackgroundList(context) {
minimapLabelEnter
.append('span')
.html(t.html('background.minimap.description'));
.call(t.append('background.minimap.description'));
var panelLabelEnter = bgExtrasListEnter
@@ -93,7 +93,7 @@ export function uiSectionBackgroundList(context) {
panelLabelEnter
.append('span')
.html(t.html('background.panel.description'));
.call(t.append('background.panel.description'));
var locPanelLabelEnter = bgExtrasListEnter
.append('li')
@@ -115,7 +115,7 @@ export function uiSectionBackgroundList(context) {
locPanelLabelEnter
.append('span')
.html(t.html('background.location_panel.description'));
.call(t.append('background.location_panel.description'));
// "Info / Report a Problem" link
@@ -129,7 +129,7 @@ export function uiSectionBackgroundList(context) {
.call(svgIcon('#iD-icon-out-link', 'inline'))
.attr('href', 'https://github.com/openstreetmap/iD/blob/develop/FAQ.md#how-can-i-report-an-issue-with-background-imagery')
.append('span')
.html(t.html('background.imagery_problem_faq'));
.call(t.append('background.imagery_problem_faq'));
_backgroundList
.call(drawListItems, 'radio', function(d3_event, d) {
modules/ui/sections/background_offset.js
+1 -1
View File
@@ -132,7 +132,7 @@ export function uiSectionBackgroundOffset(context) {
containerEnter
.append('div')
.attr('class', 'nudge-instructions')
.html(t.html('background.offset'));
.call(t.append('background.offset'));
var nudgeWrapEnter = containerEnter
.append('div')
modules/ui/sections/changes.js
+4 -4
View File
@@ -29,7 +29,7 @@ export function uiSectionChanges(context) {
.label(function() {
var history = context.history();
var summary = history.difference().summary();
return t('inspector.title_count', { title: t.html('commit.changes'), count: summary.length });
return t.html('inspector.title_count', { title: { html: t.html('commit.changes') }, count: summary.length });
})
.disclosureContent(renderDisclosureContent);
@@ -79,7 +79,7 @@ export function uiSectionChanges(context) {
buttons
.append('strong')
.attr('class', 'entity-type')
.html(function(d) {
.text(function(d) {
var matched = presetManager.match(d.entity, d.graph);
return (matched && matched.name()) || utilDisplayType(d.entity.id);
});
@@ -87,7 +87,7 @@ export function uiSectionChanges(context) {
buttons
.append('span')
.attr('class', 'entity-name')
.html(function(d) {
.text(function(d) {
var name = utilDisplayName(d.entity) || '',
string = '';
if (name !== '') {
@@ -132,7 +132,7 @@ export function uiSectionChanges(context) {
linkEnter
.call(svgIcon('#iD-icon-load', 'inline'))
.append('span')
.html(t.html('commit.download_changes'));
.call(t.append('commit.download_changes'));
function mouseover(d) {
modules/ui/sections/data_layers.js
+6 -6
View File
@@ -217,7 +217,7 @@ export function uiSectionDataLayers(context) {
containerEnter
.append('h4')
.attr('class', 'vectortile-header')
.html('Detroit Vector Tiles (Beta)');
.text('Detroit Vector Tiles (Beta)');
containerEnter
.append('ul')
@@ -231,7 +231,7 @@ export function uiSectionDataLayers(context) {
.call(svgIcon('#iD-icon-out-link', 'inline'))
.attr('href', 'https://github.com/osmus/detroit-mapping-challenge')
.append('span')
.html('About these layers');
.text('About these layers');
container = container
.merge(containerEnter);
@@ -265,7 +265,7 @@ export function uiSectionDataLayers(context) {
labelEnter
.append('span')
.html(function(d) { return d.name; });
.text(function(d) { return d.name; });
// Update
li
@@ -324,7 +324,7 @@ export function uiSectionDataLayers(context) {
labelEnter
.append('span')
.html(t.html('map_data.layers.custom.title'));
.call(t.append('map_data.layers.custom.title'));
liEnter
.append('button')
@@ -415,7 +415,7 @@ export function uiSectionDataLayers(context) {
historyPanelLabelEnter
.append('span')
.html(t.html('map_data.history_panel.title'));
.call(t.append('map_data.history_panel.title'));
var measurementPanelLabelEnter = panelsListEnter
.append('li')
@@ -437,7 +437,7 @@ export function uiSectionDataLayers(context) {
measurementPanelLabelEnter
.append('span')
.html(t.html('map_data.measurement_panel.title'));
.call(t.append('map_data.measurement_panel.title'));
}
context.layers().on('change.uiSectionDataLayers', section.reRender);
modules/ui/sections/entity_issues.js
+2 -2
View File
@@ -24,7 +24,7 @@ export function uiSectionEntityIssues(context) {
return _issues.length > 0;
})
.label(function() {
return t('inspector.title_count', { title: t.html('issues.list_title'), count: _issues.length });
return t.html('inspector.title_count', { title: { html: t.html('issues.list_title') }, count: _issues.length });
})
.disclosureContent(renderDisclosureContent);
@@ -169,7 +169,7 @@ export function uiSectionEntityIssues(context) {
.call(d.reference);
} else {
d3_select(this)
.html(t.html('inspector.no_documentation_key'));
.call(t.append('inspector.no_documentation_key'));
}
});
modules/ui/sections/map_features.js
+2 -2
View File
@@ -32,7 +32,7 @@ export function uiSectionMapFeatures(context) {
.append('a')
.attr('class', 'feature-list-link')
.attr('href', '#')
.html(t.html('issues.disable_all'))
.call(t.append('issues.disable_all'))
.on('click', function(d3_event) {
d3_event.preventDefault();
context.features().disableAll();
@@ -42,7 +42,7 @@ export function uiSectionMapFeatures(context) {
.append('a')
.attr('class', 'feature-list-link')
.attr('href', '#')
.html(t.html('issues.enable_all'))
.call(t.append('issues.enable_all'))
.on('click', function(d3_event) {
d3_event.preventDefault();
context.features().enableAll();
modules/ui/sections/photo_overlays.js
+1 -1
View File
@@ -273,7 +273,7 @@ export function uiSectionPhotoOverlays(context) {
labelEnter
.append('span')
.html(t.html('photo_overlays.username_filter.title'));
.call(t.append('photo_overlays.username_filter.title'));
labelEnter
.append('input')
modules/ui/sections/privacy.js
+2 -2
View File
@@ -41,7 +41,7 @@ export function uiSectionPrivacy(context) {
thirdPartyIconsEnter
.append('span')
.html(t.html('preferences.privacy.third_party_icons.description'));
.call(t.append('preferences.privacy.third_party_icons.description'));
// Privacy Policy link
@@ -55,7 +55,7 @@ export function uiSectionPrivacy(context) {
.call(svgIcon('#iD-icon-out-link', 'inline'))
.attr('href', 'https://github.com/openstreetmap/iD/blob/release/PRIVACY.md')
.append('span')
.html(t.html('preferences.privacy.privacy_link'));
.call(t.append('preferences.privacy.privacy_link'));
update();
modules/ui/sections/raw_member_editor.js
+5 -5
View File
@@ -33,7 +33,7 @@ export function uiSectionRawMemberEditor(context) {
var gt = entity.members.length > _maxMembers ? '>' : '';
var count = gt + entity.members.slice(0, _maxMembers).length;
return t('inspector.title_count', { title: t.html('inspector.members'), count: count });
return t.html('inspector.title_count', { title: { html: t.html('inspector.members') }, count: count });
})
.disclosureContent(renderDisclosureContent);
@@ -190,7 +190,7 @@ export function uiSectionRawMemberEditor(context) {
labelLink
.append('span')
.attr('class', 'member-entity-type')
.html(function(d) {
.text(function(d) {
var matched = presetManager.match(d.member, context.graph());
return (matched && matched.name()) || utilDisplayType(d.member.id);
});
@@ -198,7 +198,7 @@ export function uiSectionRawMemberEditor(context) {
labelLink
.append('span')
.attr('class', 'member-entity-name')
.html(function(d) { return utilDisplayName(d.member); });
.text(function(d) { return utilDisplayName(d.member); });
label
.append('button')
@@ -221,12 +221,12 @@ export function uiSectionRawMemberEditor(context) {
labelText
.append('span')
.attr('class', 'member-entity-type')
.html(t.html('inspector.' + d.type, { id: d.id }));
.call(t.append('inspector.' + d.type, { id: d.id }));
labelText
.append('span')
.attr('class', 'member-entity-name')
.html(t.html('inspector.incomplete', { id: d.id }));
.call(t.append('inspector.incomplete', { id: d.id }));
label
.append('button')
modules/ui/sections/raw_membership_editor.js
+4 -4
View File
@@ -31,7 +31,7 @@ export function uiSectionRawMembershipEditor(context) {
var parents = getSharedParentRelations();
var gt = parents.length > _maxMemberships ? '>' : '';
var count = gt + parents.slice(0, _maxMemberships).length;
return t('inspector.title_count', { title: t.html('inspector.relations'), count: count });
return t.html('inspector.title_count', { title: { html: t.html('inspector.relations') }, count: count });
})
.disclosureContent(renderDisclosureContent);
@@ -341,15 +341,15 @@ export function uiSectionRawMembershipEditor(context) {
labelLink
.append('span')
.attr('class', 'member-entity-type')
.html(function(d) {
.text(function(d) {
var matched = presetManager.match(d.relation, context.graph());
return (matched && matched.name()) || t('inspector.relation');
return (matched && matched.name()) || t.html('inspector.relation');
});
labelLink
.append('span')
.attr('class', 'member-entity-name')
.html(function(d) { return utilDisplayName(d.relation); });
.text(function(d) { return utilDisplayName(d.relation); });
labelEnter
.append('button')
modules/ui/sections/raw_tag_editor.js
+1 -1
View File
@@ -17,7 +17,7 @@ export function uiSectionRawTagEditor(id, context) {
.classes('raw-tag-editor')
.label(function() {
var count = Object.keys(_tags).filter(function(d) { return d; }).length;
return t('inspector.title_count', { title: t.html('inspector.tags'), count: count });
return t.html('inspector.title_count', { title: { html: t.html('inspector.tags') }, count: count });
})
.expandedByDefault(false)
.disclosureContent(renderDisclosureContent);
modules/ui/sections/selection_list.js
+3 -3
View File
@@ -17,7 +17,7 @@ export function uiSectionSelectionList(context) {
return _selectedIDs.length > 1;
})
.label(function() {
return t('inspector.title_count', { title: t.html('inspector.features'), count: _selectedIDs.length });
return t.html('inspector.title_count', { title: { html: t.html('inspector.features') }, count: _selectedIDs.length });
})
.disclosureContent(renderDisclosureContent);
@@ -116,10 +116,10 @@ export function uiSectionSelectionList(context) {
});
items.selectAll('.entity-type')
.html(function(entity) { return presetManager.match(entity, context.graph()).name(); });
.text(function(entity) { return presetManager.match(entity, context.graph()).name(); });
items.selectAll('.entity-name')
.html(function(d) {
.text(function(d) {
// fetch latest entity
var entity = context.entity(d.id);
return utilDisplayName(entity);
modules/ui/sections/validation_issues.js
+2 -2
View File
@@ -19,7 +19,7 @@ export function uiSectionValidationIssues(id, severity, context) {
.label(function() {
if (!_issues) return '';
var issueCountText = _issues.length > 1000 ? '1000+' : String(_issues.length);
return t('inspector.title_count', { title: t.html('issues.' + severity + 's.list_title'), count: issueCountText });
return t.html('inspector.title_count', { title: { html: t.html('issues.' + severity + 's.list_title') }, count: issueCountText });
})
.disclosureContent(renderDisclosureContent)
.shouldDisplay(function() {
@@ -174,7 +174,7 @@ export function uiSectionValidationIssues(id, severity, context) {
linkEnter
.append('span')
.attr('class', 'autofix-all-link-text')
.html(t.html('issues.fix_all.title'));
.call(t.append('issues.fix_all.title'));
linkEnter
.append('span')
modules/ui/sections/validation_rules.js
+3 -3
View File
@@ -45,7 +45,7 @@ export function uiSectionValidationRules(context) {
.append('a')
.attr('class', 'issue-rules-link')
.attr('href', '#')
.html(t.html('issues.disable_all'))
.call(t.append('issues.disable_all'))
.on('click', function(d3_event) {
d3_event.preventDefault();
context.validator().disableRules(_ruleKeys);
@@ -55,7 +55,7 @@ export function uiSectionValidationRules(context) {
.append('a')
.attr('class', 'issue-rules-link')
.attr('href', '#')
.html(t.html('issues.enable_all'))
.call(t.append('issues.enable_all'))
.on('click', function(d3_event) {
d3_event.preventDefault();
context.validator().disableRules([]);
@@ -104,7 +104,7 @@ export function uiSectionValidationRules(context) {
.html(function(d) {
var params = {};
if (d === 'unsquare_way') {
params.val = '<span class="square-degrees"></span>';
params.val = { html: '<span class="square-degrees"></span>' };
}
return t.html('issues.' + d + '.title', params);
});
modules/ui/sections/validation_status.js
+4 -4
View File
@@ -78,7 +78,7 @@ export function uiSectionValidationStatus(context) {
.merge(resetIgnoredEnter);
resetIgnored.select('a')
.html(t('inspector.title_count', { title: t.html('issues.reset_ignored'), count: ignoredIssues.length }));
.html(t.html('inspector.title_count', { title: { html: t.html('issues.reset_ignored') }, count: ignoredIssues.length }));
resetIgnored.on('click', function(d3_event) {
d3_event.preventDefault();
@@ -96,7 +96,7 @@ export function uiSectionValidationStatus(context) {
var hiddenIssues = context.validator().getIssues(hiddenOpts);
if (hiddenIssues.length) {
selection.select('.box .details')
.html(t.html(
.call(t.append(
'issues.no_issues.hidden_issues.' + type,
{ count: hiddenIssues.length.toString() }
));
@@ -104,7 +104,7 @@ export function uiSectionValidationStatus(context) {
}
}
selection.select('.box .details')
.html(t.html('issues.no_issues.hidden_issues.none'));
.call(t.append('issues.no_issues.hidden_issues.none'));
}
var messageType;
@@ -159,7 +159,7 @@ export function uiSectionValidationStatus(context) {
}
selection.select('.box .message')
.html(t.html('issues.no_issues.message.' + messageType));
.call(t.append('issues.no_issues.message.' + messageType));
}
modules/ui/settings/custom_background.js
+2 -2
View File
@@ -27,7 +27,7 @@ export function uiSettingsCustomBackground() {
modal.select('.modal-section.header')
.append('h3')
.html(t.html('settings.custom_background.header'));
.call(t.append('settings.custom_background.header'));
var textSection = modal.select('.modal-section.message-text');
@@ -70,7 +70,7 @@ export function uiSettingsCustomBackground() {
buttonSection
.insert('button', '.ok-button')
.attr('class', 'button cancel-button secondary-action')
.html(t.html('confirm.cancel'));
.call(t.append('confirm.cancel'));
buttonSection.select('.cancel-button')
modules/ui/settings/custom_data.js
+5 -5
View File
@@ -30,7 +30,7 @@ export function uiSettingsCustomData(context) {
modal.select('.modal-section.header')
.append('h3')
.html(t.html('settings.custom_data.header'));
.call(t.append('settings.custom_data.header'));
var textSection = modal.select('.modal-section.message-text');
@@ -38,7 +38,7 @@ export function uiSettingsCustomData(context) {
textSection
.append('pre')
.attr('class', 'instructions-file')
.html(t.html('settings.custom_data.file.instructions'));
.call(t.append('settings.custom_data.file.instructions'));
textSection
.append('input')
@@ -58,12 +58,12 @@ export function uiSettingsCustomData(context) {
textSection
.append('h4')
.html(t.html('settings.custom_data.or'));
.call(t.append('settings.custom_data.or'));
textSection
.append('pre')
.attr('class', 'instructions-url')
.html(t.html('settings.custom_data.url.instructions'));
.call(t.append('settings.custom_data.url.instructions'));
textSection
.append('textarea')
@@ -79,7 +79,7 @@ export function uiSettingsCustomData(context) {
buttonSection
.insert('button', '.ok-button')
.attr('class', 'button cancel-button secondary-action')
.html(t.html('confirm.cancel'));
.call(t.append('confirm.cancel'));
buttonSection.select('.cancel-button')
modules/ui/shortcuts.js
+6 -6
View File
@@ -27,7 +27,7 @@ export function uiShortcuts(context) {
.append('div')
.attr('class', 'modal-section')
.append('h3')
.html(t.html('shortcuts.title'));
.call(t.append('shortcuts.title'));
fileFetcher.get('shortcuts')
.then(function(data) {
@@ -152,11 +152,11 @@ export function uiShortcuts(context) {
selection
.append('kbd')
.attr('class', 'modifier')
.html(function (d) { return uiCmd.display(d); });
.text(function (d) { return uiCmd.display(d); });
selection
.append('span')
.html('+');
.text('+');
});
@@ -201,7 +201,7 @@ export function uiShortcuts(context) {
selection
.append('kbd')
.attr('class', 'shortcut')
.html(function (d) { return d.shortcut; });
.text(function (d) { return d.shortcut; });
}
if (i < nodes.length - 1) {
@@ -211,7 +211,7 @@ export function uiShortcuts(context) {
} else if (i === nodes.length - 1 && d.suffix) {
selection
.append('span')
.html(d.suffix);
.text(d.suffix);
}
});
@@ -223,7 +223,7 @@ export function uiShortcuts(context) {
selection
.append('span')
.html('+');
.text('+');
selection
.append('span')
modules/ui/source_switch.js
+1 -1
View File
@@ -41,7 +41,7 @@ export function uiSourceSwitch(context) {
selection
.append('a')
.attr('href', '#')
.html(t.html('source_switch.live'))
.call(t.append('source_switch.live'))
.attr('class', 'live chip')
.on('click', click);
};
modules/ui/splash.js
+7 -7
View File
@@ -42,7 +42,7 @@ export function uiSplash(context) {
.append('div')
.attr('class','modal-section')
.append('h3')
.html(t.html('splash.welcome'));
.call(t.append('splash.welcome'));
let modalSection = introModal
.append('div')
@@ -52,16 +52,16 @@ export function uiSplash(context) {
.append('p')
.html(t.html('splash.text', {
version: context.version,
website: '<a target="_blank" href="https://github.com/openstreetmap/iD/blob/develop/CHANGELOG.md#whats-new">changelog</a>',
github: '<a target="_blank" href="https://github.com/openstreetmap/iD/issues">github.com</a>'
website: { html: '<a target="_blank" href="https://github.com/openstreetmap/iD/blob/develop/CHANGELOG.md#whats-new">changelog</a>' },
github: { html: '<a target="_blank" href="https://github.com/openstreetmap/iD/issues">github.com</a>' }
}));
modalSection
.append('p')
.html(t.html('splash.privacy', {
updateMessage: updateMessage,
privacyLink: '<a target="_blank" href="https://github.com/openstreetmap/iD/blob/release/PRIVACY.md">' +
t('splash.privacy_policy') + '</a>'
privacyLink: { html: '<a target="_blank" href="https://github.com/openstreetmap/iD/blob/release/PRIVACY.md">' +
t('splash.privacy_policy') + '</a>' }
}));
let buttonWrap = introModal
@@ -84,7 +84,7 @@ export function uiSplash(context) {
walkthrough
.append('div')
.html(t.html('splash.walkthrough'));
.call(t.append('splash.walkthrough'));
let startEditing = buttonWrap
.append('button')
@@ -99,7 +99,7 @@ export function uiSplash(context) {
startEditing
.append('div')
.html(t.html('splash.start'));
.call(t.append('splash.start'));
modalSelection.select('button.close')
.attr('class','hide');
modules/ui/status.js
+7 -7
View File
@@ -22,14 +22,14 @@ export function uiStatus(context) {
} else if (apiStatus === 'rateLimited') {
selection
.html(t.html('osm_api_status.message.rateLimit'))
.call(t.append('osm_api_status.message.rateLimit'))
.append('a')
.attr('href', '#')
.attr('class', 'api-status-login')
.attr('target', '_blank')
.call(svgIcon('#iD-icon-out-link', 'inline'))
.append('span')
.html(t.html('login'))
.call(t.append('login'))
.on('click.login', function(d3_event) {
d3_event.preventDefault();
osm.authenticate();
@@ -47,11 +47,11 @@ export function uiStatus(context) {
// eslint-disable-next-line no-warning-comments
// TODO: nice messages for different error types
selection
.html(t.html('osm_api_status.message.error') + ' ')
.call(t.append('osm_api_status.message.error', { suffix: ' ' }))
.append('a')
.attr('href', '#')
// let the user manually retry their connection directly
.html(t.html('osm_api_status.retry'))
.call(t.append('osm_api_status.retry'))
.on('click.retry', function(d3_event) {
d3_event.preventDefault();
throttledRetry();
@@ -59,9 +59,9 @@ export function uiStatus(context) {
}
} else if (apiStatus === 'readonly') {
selection.html(t.html('osm_api_status.message.readonly'));
selection.call(t.append('osm_api_status.message.readonly'));
} else if (apiStatus === 'offline') {
selection.html(t.html('osm_api_status.message.offline'));
selection.call(t.append('osm_api_status.message.offline'));
}
selection.attr('class', 'api-status ' + (err ? 'error' : apiStatus));
@@ -70,7 +70,7 @@ export function uiStatus(context) {
osm.on('apiStatusChange.uiStatus', update);
context.history().on('storage_error', () => {
selection.html(t.html('osm_api_status.message.local_storage_full'));
selection.call(t.append('osm_api_status.message.local_storage_full'));
selection.attr('class', 'api-status error');
});
modules/ui/success.js
+15 -15
View File
@@ -82,7 +82,7 @@ export function uiSuccess(context) {
header
.append('h3')
.html(t.html('success.just_edited'));
.call(t.append('success.just_edited'));
header
.append('button')
@@ -100,18 +100,18 @@ export function uiSuccess(context) {
summary
.append('h3')
.html(t.html('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
.call(t.append('success.thank_you' + (_location ? '_location' : ''), { where: _location }));
summary
.append('p')
.html(t.html('success.help_html'))
.call(t.append('success.help_html'))
.append('a')
.attr('class', 'link-out')
.attr('target', '_blank')
.attr('href', t('success.help_link_url'))
.call(svgIcon('#iD-icon-out-link', 'inline'))
.append('span')
.html(t.html('success.help_link_text'));
.call(t.append('success.help_link_text'));
let osm = context.connection();
if (!osm) return;
@@ -146,12 +146,12 @@ export function uiSuccess(context) {
.attr('class', 'cell-detail summary-view-on-osm')
.attr('target', '_blank')
.attr('href', changesetURL)
.html(t.html('success.view_on_osm'));
.call(t.append('success.view_on_osm'));
summaryDetail
.append('div')
.html(t.html('success.changeset_id', {
changeset_id: `<a href="${changesetURL}" target="_blank">${_changeset.id}</a>`
changeset_id: { html: `<a href="${changesetURL}" target="_blank">${_changeset.id}</a>` }
}));
@@ -194,7 +194,7 @@ export function uiSuccess(context) {
communityLinks
.append('h3')
.html(t.html('success.like_osm'));
.call(t.append('success.like_osm'));
let table = communityLinks
.append('table')
@@ -228,14 +228,14 @@ export function uiSuccess(context) {
communityLinks
.append('div')
.attr('class', 'community-missing')
.html(t.html('success.missing'))
.call(t.append('success.missing'))
.append('a')
.attr('class', 'link-out')
.attr('target', '_blank')
.call(svgIcon('#iD-icon-out-link', 'inline'))
.attr('href', 'https://github.com/osmlab/osm-community-index/issues')
.append('span')
.html(t.html('success.tell_us'));
.call(t.append('success.tell_us'));
}
@@ -292,7 +292,7 @@ export function uiSuccess(context) {
.select('.hide-toggle')
.append('span')
.attr('class', 'badge-text')
.html(nextEvents.length);
.text(nextEvents.length);
}
@@ -319,7 +319,7 @@ export function uiSuccess(context) {
moreEnter
.append('div')
.attr('class', 'community-languages')
.html(t.html('success.languages', { languages: languageList }));
.call(t.append('success.languages', { languages: languageList }));
}
}
@@ -342,7 +342,7 @@ export function uiSuccess(context) {
.append('a')
.attr('target', '_blank')
.attr('href', d => d.url)
.html(d => {
.text(d => {
let name = d.name;
if (d.i18n && d.id) {
name = t(`community.${communityID}.events.${d.id}.name`, { default: name });
@@ -353,7 +353,7 @@ export function uiSuccess(context) {
itemEnter
.append('div')
.attr('class', 'community-event-when')
.html(d => {
.text(d => {
let options = { weekday: 'short', day: 'numeric', month: 'short', year: 'numeric' };
if (d.date.getHours() || d.date.getMinutes()) { // include time if it has one
options.hour = 'numeric';
@@ -365,7 +365,7 @@ export function uiSuccess(context) {
itemEnter
.append('div')
.attr('class', 'community-event-where')
.html(d => {
.text(d => {
let where = d.where;
if (d.i18n && d.id) {
where = t(`community.${communityID}.events.${d.id}.where`, { default: where });
@@ -376,7 +376,7 @@ export function uiSuccess(context) {
itemEnter
.append('div')
.attr('class', 'community-event-description')
.html(d => {
.text(d => {
let description = d.description;
if (d.i18n && d.id) {
description = t(`community.${communityID}.events.${d.id}.description`, { default: description });
modules/ui/tag_reference.js
+16 -6
View File
@@ -2,7 +2,7 @@ import {
select as d3_select
} from 'd3-selection';
import { t, localizer } from '../core/localizer';
import { t } from '../core/localizer';
import { services } from '../services';
import { svgIcon } from '../svg/icon';
@@ -44,7 +44,7 @@ export function uiTagReference(what) {
_body
.append('p')
.attr('class', 'tag-reference-description')
.html(t.html('inspector.no_documentation_key'));
.call(t.append('inspector.no_documentation_key'));
done();
return;
}
@@ -60,10 +60,20 @@ export function uiTagReference(what) {
done();
}
_body
var tagReferenceDescription = _body
.append('p')
.attr('class', 'tag-reference-description')
.html(docs.description ? localizer.htmlForLocalizedText(docs.description, docs.descriptionLocaleCode) : t.html('inspector.no_documentation_key'))
.append('span');
if (docs.description) {
tagReferenceDescription = tagReferenceDescription
.attr('class', 'localized-text')
.attr('lang', docs.descriptionLocaleCode || 'und')
.text(docs.description);
} else {
tagReferenceDescription = tagReferenceDescription
.call(t.append('inspector.no_documentation_key'));
}
tagReferenceDescription
.append('a')
.attr('class', 'tag-reference-edit')
.attr('target', '_blank')
@@ -79,7 +89,7 @@ export function uiTagReference(what) {
.attr('href', docs.wiki.url)
.call(svgIcon('#iD-icon-out-link', 'inline'))
.append('span')
.html(t.html(docs.wiki.text));
.call(t.append(docs.wiki.text));
}
// Add link to info about "good changeset comments" - #2923
@@ -91,7 +101,7 @@ export function uiTagReference(what) {
.call(svgIcon('#iD-icon-out-link', 'inline'))
.attr('href', t('commit.about_changeset_comments_link'))
.append('span')
.html(t.html('commit.about_changeset_comments'));
.call(t.append('commit.about_changeset_comments'));
}
}
modules/ui/tools/save.js
+2 -2
View File
@@ -67,7 +67,7 @@ export function uiToolSave(context) {
.style('background', bgColor(_numChanges));
button.select('span.count')
.html(_numChanges);
.text(_numChanges);
}
}
@@ -112,7 +112,7 @@ export function uiToolSave(context) {
.append('span')
.attr('class', 'count')
.attr('aria-hidden', 'true')
.html('0');
.text('0');
updateCount();
modules/ui/tools/undo_redo.js
+2 -2
View File
@@ -85,8 +85,8 @@ export function uiToolUndoRedo(context) {
// there are no tooltips for touch interactions so flash feedback instead
var text = annotation ?
t(d.id + '.tooltip', { action: annotation }) :
t(d.id + '.nothing');
t.html(d.id + '.tooltip', { action: annotation }) :
t.html(d.id + '.nothing');
context.ui().flash
.duration(2000)
.iconName('#' + d.icon)
modules/ui/tooltip.js
+1 -1
View File
@@ -86,7 +86,7 @@ export function uiTooltip(klass) {
keyhintWrapEnter
.append('span')
.html(t.html('tooltip_keyhint'));
.call(t.append('tooltip_keyhint'));
keyhintWrap = keyhintWrapEnter.merge(keyhintWrap);
modules/ui/version.js
+1 -1
View File
@@ -32,7 +32,7 @@ export function uiVersion(context) {
.append('a')
.attr('target', '_blank')
.attr('href', 'https://github.com/openstreetmap/iD')
.html(currVersion);
.text(currVersion);
// only show new version indicator to users that have used iD before
if (isNewVersion && !isNewUser) {
modules/ui/view_on_keepRight.js
+1 -1
View File
@@ -30,7 +30,7 @@ export function uiViewOnKeepRight() {
linkEnter
.append('span')
.html(t.html('inspector.view_on_keepRight'));
.call(t.append('inspector.view_on_keepRight'));
}
viewOnKeepRight.what = function(val) {
modules/ui/view_on_osm.js
+1 -1
View File
@@ -33,7 +33,7 @@ export function uiViewOnOSM(context) {
linkEnter
.append('span')
.html(t.html('inspector.view_on_osm'));
.call(t.append('inspector.view_on_osm'));
}
modules/ui/view_on_osmose.js
+1 -1
View File
@@ -30,7 +30,7 @@ export function uiViewOnOsmose() {
linkEnter
.append('span')
.html(t.html('inspector.view_on_osmose'));
.call(t.append('inspector.view_on_osmose'));
}
viewOnOsmose.what = function(val) {
modules/validations/almost_junction.js
+1 -1
View File
@@ -157,7 +157,7 @@ export function validationAlmostJunction(context) {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.almost_junction.highway-highway.reference'));
.call(t.append('issues.almost_junction.highway-highway.reference'));
}
function isExtendableCandidate(node, way) {
modules/validations/crossing_ways.js
+1 -1
View File
@@ -481,7 +481,7 @@ export function validationCrossingWays(context) {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.crossing_ways.' + crossingTypeID + '.reference'));
.call(t.append('issues.crossing_ways.' + crossingTypeID + '.reference'));
}
}
modules/validations/disconnected_way.js
+1 -1
View File
@@ -85,7 +85,7 @@ export function validationDisconnectedWay() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.disconnected_way.routable.reference'));
.call(t.append('issues.disconnected_way.routable.reference'));
}
function routingIslandForEntity(entity) {
modules/validations/help_request.js
+1 -1
View File
@@ -46,7 +46,7 @@ export function validationHelpRequest(context) {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.fixme_tag.reference'));
.call(t.append('issues.fixme_tag.reference'));
}
};
modules/validations/impossible_oneway.js
+1 -1
View File
@@ -212,7 +212,7 @@ export function validationImpossibleOneway() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.impossible_oneway.' + referenceID + '.reference'));
.call(t.append('issues.impossible_oneway.' + referenceID + '.reference'));
};
}
}
modules/validations/incompatible_source.js
+1 -1
View File
@@ -68,7 +68,7 @@ export function validationIncompatibleSource() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html(`issues.incompatible_source.reference.${id}`));
.call(t.append(`issues.incompatible_source.reference.${id}`));
};
}
};
modules/validations/invalid_format.js
+2 -2
View File
@@ -28,7 +28,7 @@ export function validationFormatting() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.invalid_format.email.reference'));
.call(t.append('issues.invalid_format.email.reference'));
}
/*
function showReferenceWebsite(selection) {
@@ -37,7 +37,7 @@ export function validationFormatting() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.invalid_format.website.reference'));
.call(t.append('issues.invalid_format.website.reference'));
}
if (entity.tags.website) {
modules/validations/mismatched_geometry.js
+5 -5
View File
@@ -136,7 +136,7 @@ export function validationMismatchedGeometry() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.tag_suggests_area.reference'));
.call(t.append('issues.tag_suggests_area.reference'));
}
}
@@ -171,7 +171,7 @@ export function validationMismatchedGeometry() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.vertex_as_point.reference'));
.call(t.append('issues.vertex_as_point.reference'));
},
entityIds: [entity.id]
});
@@ -194,7 +194,7 @@ export function validationMismatchedGeometry() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.point_as_vertex.reference'));
.call(t.append('issues.point_as_vertex.reference'));
},
entityIds: [entity.id],
dynamicFixes: extractPointDynamicFixes
@@ -274,7 +274,7 @@ export function validationMismatchedGeometry() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.mismatched_geometry.reference'));
.call(t.append('issues.mismatched_geometry.reference'));
},
entityIds: [entity.id],
dynamicFixes: dynamicFixes
@@ -393,7 +393,7 @@ export function validationMismatchedGeometry() {
.enter()
.append('div')
.attr('class', 'issue-reference')
.html(t.html('issues.unclosed_multipolygon_part.reference'));
.call(t.append('issues.unclosed_multipolygon_part.reference'));
}
}

Some files were not shown because too many files have changed in this diff Show More