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

Merge branch 'label-rendering' into develop

Browse Source
This commit is contained in:
Martin Raifer
2022-07-11 19:20:38 +02:00
parent 379faf83d4 7d546a8f60
commit b61dfe7b8c
105 changed files with 355 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -61,6 +61,7 @@ _Breaking developer changes, which may affect downstream projects or sites that
* Better fallback icons for untagged points, vertices, lines and areas ([#9157])
* Add fallback values for access field for barrier presets
#### :hammer: Development
* Reduce uses of unsafe html injecting code
[#8419]: https://github.com/openstreetmap/iD/issues/8419
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.html('operations.follow.error.needs_more_initial_nodes'))();
.label(t.append('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.html(`operations.follow.error.intersection_of_multiple_ways.${featureType}`))();
.label(t.append(`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.html(`operations.follow.error.intersection_of_different_ways.${featureType}`))();
.label(t.append(`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.html('operations.follow.error.unknown'))();
.label(t.append('operations.follow.error.unknown'))();
}
}
modules/behavior/operation.js
+1 -1
View File
@@ -19,7 +19,7 @@ export function behaviorOperation(context) {
.duration(4000)
.iconName('#iD-operation-' + _operation.id)
.iconClass('operation disabled')
.label(_operation.tooltip)();
.label(_operation.tooltip())();
} else {
context.ui().flash
modules/core/localizer.js
+3 -1
View File
@@ -376,7 +376,7 @@ export function coreLocalizer() {
// 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 ret = function(selection) {
const info = localizer.tInfo(stringId, replacements, locale);
return selection.append('span')
.attr('class', 'localized-text')
@@ -385,6 +385,8 @@ export function coreLocalizer() {
+ info.text
+ (replacements &&replacements.suffix || ''));
};
ret.stringId = stringId;
return ret;
};
localizer.languageName = (code, options) => {
modules/core/validation/models.js
+1 -1
View File
@@ -66,7 +66,7 @@ export function validationIssue(attrs) {
if (issue.severity === 'warning') {
// allow ignoring any issue that's not an error
fixes.push(new validationIssueFix({
title: t.html('issues.fix.ignore_issue.title'),
title: t.append('issues.fix.ignore_issue.title'),
icon: 'iD-icon-close',
onClick: function() {
context.validator().ignoreIssue(this.issue.id);
modules/modes/add_note.js
+1 -1
View File
@@ -10,7 +10,7 @@ export function modeAddNote(context) {
var mode = {
id: 'add-note',
button: 'note',
description: t.html('modes.add_note.description'),
description: t.append('modes.add_note.description'),
key: t('modes.add_note.key')
};
modules/modes/browse.js
+2 -2
View File
@@ -14,8 +14,8 @@ export function modeBrowse(context) {
var mode = {
button: 'browse',
id: 'browse',
title: t('modes.browse.title'),
description: t('modes.browse.description')
title: t.append('modes.browse.title'),
description: t.append('modes.browse.description')
};
var sidebar;
modules/modes/drag_node.js
+3 -3
View File
@@ -138,7 +138,7 @@ export function modeDragNode(context) {
context.ui().flash
.duration(4000)
.iconName('#iD-icon-no')
.label(t('modes.drag_node.connected_to_hidden'))();
.label(t.append('modes.drag_node.connected_to_hidden'))();
}
return drag.cancel();
}
@@ -239,7 +239,7 @@ export function modeDragNode(context) {
context.ui().flash
.duration(4000)
.iconName('#iD-icon-no')
.label(t.html('operations.connect.' + isInvalid,
.label(t.append('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.html('self_intersection.error.' + errorID))();
.label(t.append('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.html('self_intersection.error.areas'))();
.label(t.append('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.html('self_intersection.error.lines'))();
.label(t.append('self_intersection.error.lines'))();
});
mode.wayID = wayID;
modules/modes/select.js
+2 -2
View File
@@ -327,7 +327,7 @@ export function modeSelect(context, selectedIDs) {
.duration(4000)
.iconName('#iD-operation-' + moveOp.id)
.iconClass('operation disabled')
.label(moveOp.tooltip)();
.label(moveOp.tooltip())();
} else {
context.perform(actionMove(selectedIDs, delta, context.projection), moveOp.annotation());
context.validator().validate();
@@ -400,7 +400,7 @@ export function modeSelect(context, selectedIDs) {
.duration(4000)
.iconName('#iD-icon-no')
.iconClass('operation disabled')
.label(t.html('operations.scale.' + disabled + '.' + multi))();
.label(t.append('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/operations/circularize.js
+3 -3
View File
@@ -96,8 +96,8 @@ export function operationCircularize(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.circularize.' + disable + '.' + _amount) :
t('operations.circularize.description.' + _amount);
t.append('operations.circularize.' + disable + '.' + _amount) :
t.append('operations.circularize.description.' + _amount);
};
@@ -108,7 +108,7 @@ export function operationCircularize(context, selectedIDs) {
operation.id = 'circularize';
operation.keys = [t('operations.circularize.key')];
operation.title = t('operations.circularize.title');
operation.title = t.append('operations.circularize.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/continue.js
+3 -3
View File
@@ -60,8 +60,8 @@ export function operationContinue(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.continue.' + disable) :
t('operations.continue.description');
t.append('operations.continue.' + disable) :
t.append('operations.continue.description');
};
@@ -72,7 +72,7 @@ export function operationContinue(context, selectedIDs) {
operation.id = 'continue';
operation.keys = [t('operations.continue.key')];
operation.title = t('operations.continue.title');
operation.title = t.append('operations.continue.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/copy.js
+3 -3
View File
@@ -113,8 +113,8 @@ export function operationCopy(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.copy.' + disable, { n: selectedIDs.length }) :
t('operations.copy.description', { n: selectedIDs.length });
t.append('operations.copy.' + disable, { n: selectedIDs.length }) :
t.append('operations.copy.description', { n: selectedIDs.length });
};
@@ -132,7 +132,7 @@ export function operationCopy(context, selectedIDs) {
operation.id = 'copy';
operation.keys = [uiCmd('⌘C')];
operation.title = t('operations.copy.title');
operation.title = t.append('operations.copy.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/delete.js
+3 -3
View File
@@ -131,8 +131,8 @@ export function operationDelete(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.delete.' + disable + '.' + multi) :
t('operations.delete.description.' + multi);
t.append('operations.delete.' + disable + '.' + multi) :
t.append('operations.delete.description.' + multi);
};
@@ -145,7 +145,7 @@ export function operationDelete(context, selectedIDs) {
operation.id = 'delete';
operation.keys = [uiCmd('⌘⌫'), uiCmd('⌘⌦'), uiCmd('⌦')];
operation.title = t('operations.delete.title');
operation.title = t.append('operations.delete.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/disconnect.js
+4 -5
View File
@@ -189,10 +189,9 @@ export function operationDisconnect(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
if (disable) {
return t('operations.disconnect.' + disable);
}
return t('operations.disconnect.description.' + _descriptionID);
return disable ?
t.append('operations.disconnect.' + disable) :
t.append('operations.disconnect.description.' + _descriptionID);
};
@@ -203,7 +202,7 @@ export function operationDisconnect(context, selectedIDs) {
operation.id = 'disconnect';
operation.keys = [t('operations.disconnect.key')];
operation.title = t('operations.disconnect.title');
operation.title = t.append('operations.disconnect.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/downgrade.js
+3 -3
View File
@@ -120,8 +120,8 @@ export function operationDowngrade(context, selectedIDs) {
operation.tooltip = function () {
var disable = operation.disabled();
return disable ?
t('operations.downgrade.' + disable + '.' + _multi) :
t('operations.downgrade.description.' + _downgradeType);
t.append('operations.downgrade.' + disable + '.' + _multi) :
t.append('operations.downgrade.description.' + _downgradeType);
};
@@ -138,7 +138,7 @@ export function operationDowngrade(context, selectedIDs) {
operation.id = 'downgrade';
operation.keys = [uiCmd('⌫')];
operation.title = t('operations.downgrade.title');
operation.title = t.append('operations.downgrade.title');
operation.behavior = behaviorOperation(context).which(operation);
modules/operations/extract.js
+3 -3
View File
@@ -71,9 +71,9 @@ export function operationExtract(context, selectedIDs) {
operation.tooltip = function () {
var disableReason = operation.disabled();
if (disableReason) {
return t('operations.extract.' + disableReason + '.' + _amount);
return t.append('operations.extract.' + disableReason + '.' + _amount);
} else {
return t('operations.extract.description.' + _geometryID + '.' + _amount);
return t.append('operations.extract.description.' + _geometryID + '.' + _amount);
}
};
@@ -85,7 +85,7 @@ export function operationExtract(context, selectedIDs) {
operation.id = 'extract';
operation.keys = [t('operations.extract.key')];
operation.title = t('operations.extract.title');
operation.title = t.append('operations.extract.title');
operation.behavior = behaviorOperation(context).which(operation);
modules/operations/merge.js
+5 -5
View File
@@ -75,15 +75,15 @@ export function operationMerge(context, selectedIDs) {
var disabled = operation.disabled();
if (disabled) {
if (disabled === 'conflicting_relations') {
return t('operations.merge.conflicting_relations');
return t.append('operations.merge.conflicting_relations');
}
if (disabled === 'restriction' || disabled === 'connectivity') {
return t('operations.merge.damage_relation',
return t.append('operations.merge.damage_relation',
{ relation: presetManager.item('type/' + disabled).name() });
}
return t('operations.merge.' + disabled);
return t.append('operations.merge.' + disabled);
}
return t('operations.merge.description');
return t.append('operations.merge.description');
};
operation.annotation = function() {
@@ -92,7 +92,7 @@ export function operationMerge(context, selectedIDs) {
operation.id = 'merge';
operation.keys = [t('operations.merge.key')];
operation.title = t('operations.merge.title');
operation.title = t.append('operations.merge.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/move.js
+3 -3
View File
@@ -58,8 +58,8 @@ export function operationMove(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.move.' + disable + '.' + multi) :
t('operations.move.description.' + multi);
t.append('operations.move.' + disable + '.' + multi) :
t.append('operations.move.description.' + multi);
};
@@ -72,7 +72,7 @@ export function operationMove(context, selectedIDs) {
operation.id = 'move';
operation.keys = [t('operations.move.key')];
operation.title = t('operations.move.title');
operation.title = t.append('operations.move.title');
operation.behavior = behaviorOperation(context).which(operation);
operation.mouseOnly = true;
modules/operations/orthogonalize.js
+3 -3
View File
@@ -119,8 +119,8 @@ export function operationOrthogonalize(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.orthogonalize.' + disable + '.' + _amount) :
t('operations.orthogonalize.description.' + _type + '.' + _amount);
t.append('operations.orthogonalize.' + disable + '.' + _amount) :
t.append('operations.orthogonalize.description.' + _type + '.' + _amount);
};
@@ -131,7 +131,7 @@ export function operationOrthogonalize(context, selectedIDs) {
operation.id = 'orthogonalize';
operation.keys = [t('operations.orthogonalize.key')];
operation.title = t('operations.orthogonalize.title');
operation.title = t.append('operations.orthogonalize.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/paste.js
+3 -3
View File
@@ -76,9 +76,9 @@ export function operationPaste(context) {
var oldGraph = context.copyGraph();
var ids = context.copyIDs();
if (!ids.length) {
return t('operations.paste.nothing_copied');
return t.append('operations.paste.nothing_copied');
}
return t('operations.paste.description', { feature: utilDisplayLabel(oldGraph.entity(ids[0]), oldGraph), n: ids.length });
return t.append('operations.paste.description', { feature: utilDisplayLabel(oldGraph.entity(ids[0]), oldGraph), n: ids.length });
};
operation.annotation = function() {
@@ -88,7 +88,7 @@ export function operationPaste(context) {
operation.id = 'paste';
operation.keys = [uiCmd('⌘V')];
operation.title = t('operations.paste.title');
operation.title = t.append('operations.paste.title');
return operation;
}
modules/operations/reflect.js
+3 -3
View File
@@ -77,8 +77,8 @@ export function operationReflect(context, selectedIDs, axis) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.reflect.' + disable + '.' + multi) :
t('operations.reflect.description.' + axis + '.' + multi);
t.append('operations.reflect.' + disable + '.' + multi) :
t.append('operations.reflect.description.' + axis + '.' + multi);
};
@@ -89,7 +89,7 @@ export function operationReflect(context, selectedIDs, axis) {
operation.id = 'reflect-' + axis;
operation.keys = [t('operations.reflect.key.' + axis)];
operation.title = t('operations.reflect.title.' + axis);
operation.title = t.append('operations.reflect.title.' + axis);
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/reverse.js
+2 -2
View File
@@ -58,7 +58,7 @@ export function operationReverse(context, selectedIDs) {
operation.tooltip = function() {
return t('operations.reverse.description.' + reverseTypeID());
return t.append('operations.reverse.description.' + reverseTypeID());
};
@@ -70,7 +70,7 @@ export function operationReverse(context, selectedIDs) {
operation.id = 'reverse';
operation.keys = [t('operations.reverse.key')];
operation.title = t('operations.reverse.title');
operation.title = t.append('operations.reverse.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/rotate.js
+3 -3
View File
@@ -59,8 +59,8 @@ export function operationRotate(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.rotate.' + disable + '.' + multi) :
t('operations.rotate.description.' + multi);
t.append('operations.rotate.' + disable + '.' + multi) :
t.append('operations.rotate.description.' + multi);
};
@@ -73,7 +73,7 @@ export function operationRotate(context, selectedIDs) {
operation.id = 'rotate';
operation.keys = [t('operations.rotate.key')];
operation.title = t('operations.rotate.title');
operation.title = t.append('operations.rotate.title');
operation.behavior = behaviorOperation(context).which(operation);
operation.mouseOnly = true;
modules/operations/split.js
+4 -3
View File
@@ -68,8 +68,9 @@ export function operationSplit(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
if (disable) return t('operations.split.' + disable);
return t('operations.split.description.' + _geometry + '.' + _waysAmount + '.' + _nodesAmount + '_node');
return disable ?
t.append('operations.split.' + disable) :
t.append('operations.split.description.' + _geometry + '.' + _waysAmount + '.' + _nodesAmount + '_node');
};
@@ -89,7 +90,7 @@ export function operationSplit(context, selectedIDs) {
operation.id = 'split';
operation.keys = [t('operations.split.key')];
operation.title = t('operations.split.title');
operation.title = t.append('operations.split.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/operations/straighten.js
+3 -3
View File
@@ -124,8 +124,8 @@ export function operationStraighten(context, selectedIDs) {
operation.tooltip = function() {
var disable = operation.disabled();
return disable ?
t('operations.straighten.' + disable + '.' + _amount) :
t('operations.straighten.description.' + _geometry + (_wayIDs.length === 1 ? '' : 's'));
t.append('operations.straighten.' + disable + '.' + _amount) :
t.append('operations.straighten.description.' + _geometry + (_wayIDs.length === 1 ? '' : 's'));
};
@@ -136,7 +136,7 @@ export function operationStraighten(context, selectedIDs) {
operation.id = 'straighten';
operation.keys = [t('operations.straighten.key')];
operation.title = t('operations.straighten.title');
operation.title = t.append('operations.straighten.title');
operation.behavior = behaviorOperation(context).which(operation);
return operation;
modules/presets/category.js
+1 -1
View File
@@ -36,7 +36,7 @@ export function presetCategory(categoryID, category, allPresets) {
_this.matchScore = () => -1;
_this.name = () => t(`_tagging.presets.categories.${categoryID}.name`, { 'default': categoryID });
_this.nameLabel = () => t.html(`_tagging.presets.categories.${categoryID}.name`, { 'default': categoryID });
_this.nameLabel = () => t.append(`_tagging.presets.categories.${categoryID}.name`, { 'default': categoryID });
_this.terms = () => [];
modules/presets/field.js
+3 -1
View File
@@ -26,7 +26,9 @@ export function presetField(fieldID, field) {
_this.hasTextForStringId = (scope) => localizer.hasTextForStringId(`_tagging.presets.fields.${fieldID}.${scope}`);
_this.title = () => _this.overrideLabel || _this.t('label', { 'default': fieldID });
_this.label = () => _this.overrideLabel || _this.t.html('label', { 'default': fieldID });
_this.label = () => _this.overrideLabel ?
selection => selection.text(_this.overrideLabel) :
_this.t.append('label', { 'default': fieldID });
const _placeholder = _this.placeholder;
_this.placeholder = () => _this.t('placeholder', { 'default': _placeholder });
modules/presets/preset.js
+4 -6
View File
@@ -94,9 +94,9 @@ export function presetPreset(presetID, preset, addable, allFields, allPresets) {
return t(textID, options);
};
_this.t.html = (scope, options) => {
_this.t.append = (scope, options) => {
const textID = `_tagging.presets.presets.${presetID}.${scope}`;
return t.html(textID, options);
return t.append(textID, options);
};
@@ -104,9 +104,7 @@ export function presetPreset(presetID, preset, addable, allFields, allPresets) {
return _this.t('name', { 'default': _this.originalName });
};
_this.nameLabel = () => {
return _this.t.html('name', { 'default': _this.originalName });
};
_this.nameLabel = () => _this.t.append('name', { 'default': _this.originalName });
_this.subtitle = () => {
if (_this.suggestion) {
@@ -121,7 +119,7 @@ export function presetPreset(presetID, preset, addable, allFields, allPresets) {
if (_this.suggestion) {
let path = presetID.split('/');
path.pop(); // remove brand name
return t.html('_tagging.presets.presets.' + path.join('/') + '.name');
return t.append('_tagging.presets.presets.' + path.join('/') + '.name');
}
return null;
};
modules/renderer/background_source.js
+4 -4
View File
@@ -75,13 +75,13 @@ export function rendererBackgroundSource(data) {
source.label = function() {
var id_safe = source.id.replace(/\./g, '<TX_DOT>');
return t.html('imagery.' + id_safe + '.name', { default: escape(_name) });
return t.append('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: escape(_description) });
return t.append('imagery.' + id_safe + '.description', { default: escape(_description) });
};
@@ -536,7 +536,7 @@ rendererBackgroundSource.None = function() {
source.label = function() {
return t.html('background.none');
return t.append('background.none');
};
@@ -563,7 +563,7 @@ rendererBackgroundSource.Custom = function(template) {
};
source.label = function() {
return t.html('background.custom');
return t.append('background.custom');
};
modules/renderer/tile_layer.js
+3 -1
View File
@@ -250,7 +250,9 @@ export function rendererTileLayer(context) {
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'));
span.call(t.append('info_panels.background.vintage'));
span.append('span').text(': ');
span.call(t.append('info_panels.background.unknown'));
}
});
});
modules/ui/commit.js
+8 -5
View File
@@ -329,7 +329,9 @@ export function uiCommit(context) {
if (!labelEnter.empty()) {
labelEnter
.call(uiTooltip().title(t.html('commit.request_review_info')).placement('top'));
.call(uiTooltip()
.title(() => t.append('commit.request_review_info'))
.placement('top'));
}
labelEnter
@@ -405,7 +407,9 @@ export function uiCommit(context) {
if (uploadBlockerTooltipText) {
buttonSection.selectAll('.save-button')
.call(uiTooltip().title(uploadBlockerTooltipText).placement('top'));
.call(uiTooltip()
.title(() => uploadBlockerTooltipText)
.placement('top'));
}
// Raw Tag Editor
@@ -453,12 +457,11 @@ export function uiCommit(context) {
.getIssuesBySeverity({ what: 'edited', where: 'all' }).error;
if (errors.length) {
return t('commit.outstanding_errors_message', { count: errors.length });
return t.append('commit.outstanding_errors_message', { count: errors.length });
} else {
var hasChangesetComment = context.changeset && context.changeset.tags.comment && context.changeset.tags.comment.trim().length;
if (!hasChangesetComment) {
return t('commit.comment_needed_message');
return t.append('commit.comment_needed_message');
}
}
return null;
modules/ui/commit_warnings.js
+6 -3
View File
@@ -1,3 +1,5 @@
import { select as d3_select } from 'd3-selection';
import { t } from '../core/localizer';
import { svgIcon } from '../svg/icon';
import { uiTooltip } from './tooltip';
@@ -32,7 +34,7 @@ export function uiCommitWarnings(context) {
containerEnter
.append('h3')
.html(severity === 'warning' ? t.html('commit.warnings') : t.html('commit.errors'));
.call(severity === 'warning' ? t.append('commit.warnings') : t.append('commit.errors'));
containerEnter
.append('ul')
@@ -89,8 +91,9 @@ export function uiCommitWarnings(context) {
.merge(items);
items.selectAll('.issue-message')
.html(function(d) {
return d.message(context);
.text('')
.each(function(d) {
return d.message(context)(d3_select(this));
});
}
}
modules/ui/conflicts.js
+2 -2
View File
@@ -205,7 +205,6 @@ export function uiConflicts(context) {
.data(['previous', 'next'])
.enter()
.append('button')
.html(function(d) { return t.html('save.conflict.' + d); })
.attr('class', 'conflict-nav-button action col6')
.attr('disabled', function(d, i) {
return (i === 0 && index === 0) ||
@@ -223,7 +222,8 @@ export function uiConflicts(context) {
container
.call(showConflict, index + sign);
});
})
.call(function(d) { t.append('save.conflict.' + d)(d3_select(this)); });
}
modules/ui/disclosure.js
+7 -2
View File
@@ -51,8 +51,13 @@ export function uiDisclosure(context, key, expandedDefault) {
.attr('aria-expanded', _expanded)
.classed('expanded', _expanded);
hideToggle.selectAll('.hide-toggle-text')
.html(_label());
const label = _label();
const labelSelection = hideToggle.selectAll('.hide-toggle-text');
if (typeof label !== 'function') {
labelSelection.text(_label());
} else {
labelSelection.text('').call(label);
}
hideToggle.selectAll('.hide-toggle-icon')
.attr('xlink:href', _expanded ? '#iD-icon-down'
modules/ui/edit_menu.js
+3 -3
View File
@@ -104,8 +104,8 @@ export function uiEditMenu(context) {
buttonsEnter.each(function(d) {
var tooltip = uiTooltip()
.heading(d.title)
.title(d.tooltip())
.heading(() => d.title)
.title(d.tooltip)
.keys([d.keys[0]]);
_tooltips.push(tooltip);
@@ -164,7 +164,7 @@ export function uiEditMenu(context) {
.duration(4000)
.iconName('#iD-operation-' + operation.id)
.iconClass('operation disabled')
.label(operation.tooltip)();
.label(operation.tooltip())();
}
} else {
if (lastPointerUpType === 'touch' ||
modules/ui/entity_editor.js
+2 -1
View File
@@ -65,7 +65,8 @@ export function uiEntityEditor(context) {
.merge(headerEnter);
header.selectAll('h2')
.html(_entityIDs.length === 1 ? t.html('inspector.edit') : t.html('inspector.edit_features'));
.text('')
.call(_entityIDs.length === 1 ? t.append('inspector.edit') : t.append('inspector.edit_features'));
header.selectAll('.preset-reset')
.on('click', function() {
modules/ui/feature_info.js
+10 -3
View File
@@ -9,18 +9,25 @@ export function uiFeatureInfo(context) {
var hiddenList = features.hidden().map(function(k) {
if (stats[k]) {
count += stats[k];
return t.html('inspector.title_count', { title: { html: t.html('feature.' + k + '.description') }, count: stats[k] });
return t.append('inspector.title_count', {
title: t('feature.' + k + '.description'),
count: stats[k]
});
}
return null;
}).filter(Boolean);
selection.html('');
selection.text('');
if (hiddenList.length) {
var tooltipBehavior = uiTooltip()
.placement('top')
.title(function() {
return hiddenList.join('<br/>');
return selection => {
hiddenList.forEach(hiddenFeature => {
selection.append('div').call(hiddenFeature);
})
};
});
selection.append('a')
modules/ui/field.js
+2 -2
View File
@@ -38,7 +38,7 @@ export function uiField(context, presetField, entityIDs, options) {
var _locked = false;
var _lockedTip = uiTooltip()
.title(t.html('inspector.lock.suggestion', { label: field.label }))
.title(() => t.append('inspector.lock.suggestion', { label: field.label }))
.placement('bottom');
@@ -140,7 +140,7 @@ export function uiField(context, presetField, entityIDs, options) {
textEnter
.append('span')
.attr('class', 'label-textvalue')
.html(function(d) { return d.label(); });
.each(function(d) { d.label()(d3_select(this)); });
textEnter
.append('span')
modules/ui/fields/localized.js
+1 -1
View File
@@ -43,7 +43,7 @@ export function uiFieldLocalized(field, context) {
var _selection = d3_select(null);
var _multilingual = [];
var _buttonTip = uiTooltip()
.title(t.html('translate.translate'))
.title(() => t.append('translate.translate'))
.placement('left');
var _wikiTitles;
var _entityIDs = [];
modules/ui/flash.js
+7 -3
View File
@@ -6,7 +6,7 @@ export function uiFlash(context) {
var _duration = 2000;
var _iconName = '#iD-icon-no';
var _iconClass = 'disabled';
var _label = '';
var _label = s => s.text('');
function flash() {
if (_flashTimer) {
@@ -64,7 +64,7 @@ export function uiFlash(context) {
content
.selectAll('.flash-text')
.attr('class', 'flash-text')
.html(_label);
.call(_label);
_flashTimer = d3_timeout(function() {
@@ -89,7 +89,11 @@ export function uiFlash(context) {
flash.label = function(_) {
if (!arguments.length) return _label;
_label = _;
if (typeof _ !== 'function') {
_label = selection => selection.text(_);
} else {
_label = selection => s_;
}
return flash;
};
modules/ui/geolocate.js
+2 -2
View File
@@ -62,7 +62,7 @@ export function uiGeolocate(context) {
zoomTo();
} else {
context.ui().flash
.label(t.html('geolocate.location_unavailable'))
.label(t.append('geolocate.location_unavailable'))
.iconName('#iD-icon-geolocate')();
}
@@ -90,7 +90,7 @@ export function uiGeolocate(context) {
.call(svgIcon('#iD-icon-geolocate', 'light'))
.call(uiTooltip()
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
.title(t.html('geolocate.title'))
.title(() => t.append('geolocate.title'))
.keys([t('geolocate.key')])
);
modules/ui/info.js
+1 -1
View File
@@ -58,7 +58,7 @@ export function uiInfo(context) {
title
.append('h3')
.html(function(d) { return panels[d].label; });
.each(function(d) { return panels[d].label(d3_select(this)); });
title
.append('button')
modules/ui/init.js
+7 -3
View File
@@ -128,7 +128,7 @@ export function uiInit(context) {
.on('hitMinZoom.ui', function() {
ui.flash
.iconName('#iD-icon-no')
.label(t.html('cannot_zoom'))();
.label(t.append('cannot_zoom'))();
});
container
@@ -322,7 +322,9 @@ export function uiInit(context) {
.attr('href', 'https://github.com/openstreetmap/iD/issues')
.attr('aria-label', t('report_a_bug'))
.call(svgIcon('#iD-icon-bug', 'light'))
.call(uiTooltip().title(t.html('report_a_bug')).placement('top'));
.call(uiTooltip()
.title(() => t.append('report_a_bug'))
.placement('top'));
issueLinks
.append('a')
@@ -330,7 +332,9 @@ export function uiInit(context) {
.attr('href', 'https://github.com/openstreetmap/iD/blob/develop/CONTRIBUTING.md#translating')
.attr('aria-label', t('help_translate'))
.call(svgIcon('#iD-icon-translate', 'light'))
.call(uiTooltip().title(t.html('help_translate')).placement('top'));
.call(uiTooltip()
.title(() => t.append('help_translate'))
.placement('top'));
aboutList
.append('li')
modules/ui/intro/area.js
+4 -4
View File
@@ -328,8 +328,8 @@ export function uiIntroArea(context, reveal) {
timeout(function() {
reveal('.more-fields .combobox-input',
helpHtml('intro.areas.add_field', {
name: { html: nameField.label() },
description: { html: descriptionField.label() }
name: nameField.title(),
description: descriptionField.title()
}),
{ duration: 300 }
);
@@ -395,7 +395,7 @@ export function uiIntroArea(context, reveal) {
}, 300);
reveal('div.combobox',
helpHtml('intro.areas.choose_field', { field: { html: descriptionField.label() } }),
helpHtml('intro.areas.choose_field', { field: descriptionField.title() }),
{ duration: 300 }
);
@@ -456,7 +456,7 @@ export function uiIntroArea(context, reveal) {
context.container().select('.inspector-wrap .panewrap').style('right', '0%');
reveal('.entity-editor-pane',
helpHtml('intro.areas.retry_add_field', { field: { html: descriptionField.label() } }), {
helpHtml('intro.areas.retry_add_field', { field: descriptionField.title() }), {
buttonText: t.html('intro.ok'),
buttonCallback: function() { continueTo(clickAddField); }
});
modules/ui/intro/navigation.js
+4 -4
View File
@@ -493,8 +493,8 @@ export function uiIntroNavigation(context, reveal) {
reveal('.entity-editor-pane', helpHtml('intro.navigation.street_different_fields') + '{br}' +
helpHtml('intro.navigation.editor_street', {
button: { html: icon(href, 'inline') },
field1: { html: onewayField.label() },
field2: { html: maxspeedField.label() }
field1: onewayField.title(),
field2: maxspeedField.title()
}));
context.on('exit.intro', function() {
@@ -509,8 +509,8 @@ export function uiIntroNavigation(context, reveal) {
reveal('.entity-editor-pane', helpHtml('intro.navigation.street_different_fields') + '{br}' +
helpHtml('intro.navigation.editor_street', {
button: { html: icon(href, 'inline') },
field1: { html: onewayField.label() },
field2: { html: maxspeedField.label() }
field1: onewayField.title(),
field2: maxspeedField.title()
}), { duration: 0 }
);
});
modules/ui/issues_info.js
+1 -1
View File
@@ -62,7 +62,7 @@ export function uiIssuesInfo(context) {
var tooltipBehavior = uiTooltip()
.placement('top')
.title(t.html(d.descriptionID));
.title(() => t.append(d.descriptionID));
chipSelection
.call(tooltipBehavior)
modules/ui/pane.js
+3 -2
View File
@@ -72,7 +72,7 @@ export function uiPane(id, context) {
if (!_paneTooltip) {
_paneTooltip = uiTooltip()
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
.title(_description)
.title(() => _description)
.keys([_key]);
}
@@ -106,7 +106,8 @@ export function uiPane(id, context) {
heading
.append('h2')
.html(_label);
.text('')
.call(_label);
heading
.append('button')
modules/ui/panels/background.js
+3 -3
View File
@@ -25,7 +25,7 @@ export function uiPanelBackground(context) {
_metadata = {};
}
selection.html('');
selection.text('');
var list = selection
.append('ul')
@@ -33,7 +33,7 @@ export function uiPanelBackground(context) {
list
.append('li')
.html(_currSourceName);
.call(_currSourceName);
_metadataKeys.forEach(function(k) {
// DigitalGlobe vintage is available in raster layers for now.
@@ -159,7 +159,7 @@ export function uiPanelBackground(context) {
};
panel.id = 'background';
panel.label = t.html('info_panels.background.title');
panel.label = t.append('info_panels.background.title');
panel.key = t('info_panels.background.key');
modules/ui/panels/history.js
+1 -1
View File
@@ -254,7 +254,7 @@ export function uiPanelHistory(context) {
};
panel.id = 'history';
panel.label = t.html('info_panels.history.title');
panel.label = t.append('info_panels.history.title');
panel.key = t('info_panels.history.key');
modules/ui/panels/location.js
+1 -1
View File
@@ -68,7 +68,7 @@ export function uiPanelLocation(context) {
};
panel.id = 'location';
panel.label = t.html('info_panels.location.title');
panel.label = t.append('info_panels.location.title');
panel.key = t('info_panels.location.key');
modules/ui/panels/measurement.js
+1 -1
View File
@@ -234,7 +234,7 @@ export function uiPanelMeasurement(context) {
};
panel.id = 'measurement';
panel.label = t.html('info_panels.measurement.title');
panel.label = t.append('info_panels.measurement.title');
panel.key = t('info_panels.measurement.key');
modules/ui/panes/background.js
+2 -2
View File
@@ -11,8 +11,8 @@ export function uiPaneBackground(context) {
var backgroundPane = uiPane('background', context)
.key(t('background.key'))
.label(t.html('background.title'))
.description(t.html('background.description'))
.label(t.append('background.title'))
.description(t.append('background.description'))
.iconName('iD-icon-layers')
.sections([
uiSectionBackgroundList(context),
modules/ui/panes/help.js
+3 -3
View File
@@ -273,8 +273,8 @@ export function uiPaneHelp(context) {
var helpPane = uiPane('help', context)
.key(t('help.key'))
.label(t.html('help.title'))
.description(t.html('help.title'))
.label(t.append('help.title'))
.description(t.append('help.title'))
.iconName('iD-icon-help');
helpPane.renderContent = function(content) {
@@ -373,7 +373,7 @@ export function uiPaneHelp(context) {
.append('li')
.attr('class', 'shortcuts')
.call(uiTooltip()
.title(t.html('shortcuts.tooltip'))
.title(() => t.append('shortcuts.tooltip'))
.keys(['?'])
.placement('top')
)
modules/ui/panes/issues.js
+2 -2
View File
@@ -11,8 +11,8 @@ export function uiPaneIssues(context) {
var issuesPane = uiPane('issues', context)
.key(t('issues.key'))
.label(t.html('issues.title'))
.description(t.html('issues.title'))
.label(t.append('issues.title'))
.description(t.append('issues.title'))
.iconName('iD-icon-alert')
.sections([
uiSectionValidationOptions(context),
modules/ui/panes/map_data.js
+2 -2
View File
@@ -11,8 +11,8 @@ export function uiPaneMapData(context) {
var mapDataPane = uiPane('map-data', context)
.key(t('map_data.key'))
.label(t.html('map_data.title'))
.description(t.html('map_data.description'))
.label(t.append('map_data.title'))
.description(t.append('map_data.description'))
.iconName('iD-icon-data')
.sections([
uiSectionDataLayers(context),
modules/ui/panes/preferences.js
+2 -2
View File
@@ -7,8 +7,8 @@ export function uiPanePreferences(context) {
let preferencesPane = uiPane('preferences', context)
.key(t('preferences.key'))
.label(t.html('preferences.title'))
.description(t.html('preferences.description'))
.label(t.append('preferences.title'))
.description(t.append('preferences.description'))
.iconName('fas-user-cog')
.sections([
uiSectionPrivacy(context)
modules/ui/preset_list.js
+7 -5
View File
@@ -329,7 +329,8 @@ export function uiPresetList(context) {
.attr('class', 'namepart')
.call(svgIcon((localizer.textDirection() === 'rtl' ? '#iD-icon-backward' : '#iD-icon-forward'), 'inline'))
.append('span')
.html(function() { return preset.nameLabel() + '&hellip;'; });
.call(preset.nameLabel())
.append('span').text('…');
box = selection.append('div')
.attr('class', 'subgrid')
@@ -398,11 +399,12 @@ export function uiPresetList(context) {
].filter(Boolean);
label.selectAll('.namepart')
.data(nameparts)
.data(nameparts, d => d.stringId)
.enter()
.append('div')
.attr('class', 'namepart')
.html(function(d) { return d; });
.text('')
.each(function(d) { d(d3_select(this)); });
wrap.call(item.reference.button);
selection.call(item.reference.body);
@@ -466,8 +468,8 @@ export function uiPresetList(context) {
if (isHiddenPreset) {
var isAutoHidden = context.features().autoHidden(hiddenPresetFeaturesId);
d3_select(this).call(uiTooltip()
.title(t.html('inspector.hidden_preset.' + (isAutoHidden ? 'zoom' : 'manual'), {
features: { html: t.html('feature.' + hiddenPresetFeaturesId + '.description') }
.title(() => t.append('inspector.hidden_preset.' + (isAutoHidden ? 'zoom' : 'manual'), {
features: t('feature.' + hiddenPresetFeaturesId + '.description')
}))
.placement(index < 2 ? 'bottom' : 'top')
);
modules/ui/sections/background_display_options.js
+1 -1
View File
@@ -11,7 +11,7 @@ import { uiSection } from '../section';
export function uiSectionBackgroundDisplayOptions(context) {
var section = uiSection('background-display-options', context)
.label(t.html('background.display_options'))
.label(() => t.append('background.display_options'))
.disclosureContent(renderDisclosureContent);
var _storedOpacity = prefs('background-opacity');
modules/ui/sections/background_list.js
+11 -13
View File
@@ -1,8 +1,6 @@
import _debounce from 'lodash-es/debounce';
import { descending as d3_descending, ascending as d3_ascending } from 'd3-array';
import {
select as d3_select
} from 'd3-selection';
import { select as d3_select } from 'd3-selection';
import { prefs } from '../../core/preferences';
import { t, localizer } from '../../core/localizer';
@@ -23,7 +21,7 @@ export function uiSectionBackgroundList(context) {
.on('change', customChanged);
var section = uiSection('background-list', context)
.label(t.html('background.backgrounds'))
.label(() => t.append('background.backgrounds'))
.disclosureContent(renderDisclosureContent);
function previousBackgroundID() {
@@ -55,7 +53,7 @@ export function uiSectionBackgroundList(context) {
.attr('class', 'minimap-toggle-item')
.append('label')
.call(uiTooltip()
.title(t.html('background.minimap.tooltip'))
.title(() => t.append('background.minimap.tooltip'))
.keys([t('background.minimap.key')])
.placement('top')
);
@@ -78,7 +76,7 @@ export function uiSectionBackgroundList(context) {
.attr('class', 'background-panel-toggle-item')
.append('label')
.call(uiTooltip()
.title(t.html('background.panel.tooltip'))
.title(() => t.append('background.panel.tooltip'))
.keys([uiCmd('⌘⇧' + t('info_panels.background.key'))])
.placement('top')
);
@@ -100,7 +98,7 @@ export function uiSectionBackgroundList(context) {
.attr('class', 'location-panel-toggle-item')
.append('label')
.call(uiTooltip()
.title(t.html('background.location_panel.tooltip'))
.title(() => t.append('background.location_panel.tooltip'))
.keys([uiCmd('⌘⇧' + t('info_panels.location.key'))])
.placement('top')
);
@@ -152,13 +150,13 @@ export function uiSectionBackgroundList(context) {
if (d.id === previousBackgroundID()) {
item.call(uiTooltip()
.placement(placement)
.title('<div>' + t.html('background.switch') + '</div>')
.title(() => t.append('background.switch'))
.keys([uiCmd('⌘' + t('background.key'))])
);
} else if (description || isOverflowing) {
item.call(uiTooltip()
.placement(placement)
.title(description || d.label())
.title(() => description || d.label())
);
}
});
@@ -202,13 +200,13 @@ export function uiSectionBackgroundList(context) {
label
.append('span')
.html(function(d) { return d.label(); });
.each(function(d) { d.label()(d3_select(this)); });
enter.filter(function(d) { return d.id === 'custom'; })
.append('button')
.attr('class', 'layer-browse')
.call(uiTooltip()
.title(t.html('settings.custom_background.tooltip'))
.title(() => t.append('settings.custom_background.tooltip'))
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
)
.on('click', function(d3_event) {
@@ -221,11 +219,11 @@ export function uiSectionBackgroundList(context) {
.append('div')
.attr('class', 'best')
.call(uiTooltip()
.title(t.html('background.best_imagery'))
.title(() => t.append('background.best_imagery'))
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
)
.append('span')
.html('&#9733;');
.text('★');
layerList
.call(updateLayerSelections);
modules/ui/sections/background_offset.js
+1 -1
View File
@@ -11,7 +11,7 @@ import { uiSection } from '../section';
export function uiSectionBackgroundOffset(context) {
var section = uiSection('background-offset', context)
.label(t.html('background.fix_misalignment'))
.label(() => t.append('background.fix_misalignment'))
.disclosureContent(renderDisclosureContent)
.expandedByDefault(false);
modules/ui/sections/changes.js
+1 -1
View File
@@ -26,7 +26,7 @@ export function uiSectionChanges(context) {
.label(function() {
var history = context.history();
var summary = history.difference().summary();
return t.html('inspector.title_count', { title: { html: t.html('commit.changes') }, count: summary.length });
return t.append('inspector.title_count', { title: t('commit.changes'), count: summary.length });
})
.disclosureContent(renderDisclosureContent);
modules/ui/sections/data_layers.js
+10 -10
View File
@@ -21,7 +21,7 @@ export function uiSectionDataLayers(context) {
var layers = context.layers();
var section = uiSection('data-layers', context)
.label(t.html('map_data.data_layers'))
.label(() => t.append('map_data.data_layers'))
.disclosureContent(renderDisclosureContent);
function renderDisclosureContent(selection) {
@@ -95,14 +95,14 @@ export function uiSectionDataLayers(context) {
if (d.id === 'osm') {
d3_select(this)
.call(uiTooltip()
.title(t.html('map_data.layers.' + d.id + '.tooltip'))
.title(() => t.append('map_data.layers.' + d.id + '.tooltip'))
.keys([uiCmd('⌥' + t('area_fill.wireframe.key'))])
.placement('bottom')
);
} else {
d3_select(this)
.call(uiTooltip()
.title(t.html('map_data.layers.' + d.id + '.tooltip'))
.title(() => t.append('map_data.layers.' + d.id + '.tooltip'))
.placement('bottom')
);
}
@@ -154,7 +154,7 @@ export function uiSectionDataLayers(context) {
.each(function(d) {
d3_select(this)
.call(uiTooltip()
.title(t.html('map_data.layers.' + d.id + '.tooltip'))
.title(() => t.append('map_data.layers.' + d.id + '.tooltip'))
.placement('bottom')
);
});
@@ -166,7 +166,7 @@ export function uiSectionDataLayers(context) {
labelEnter
.append('span')
.html(function(d) { return t.html('map_data.layers.' + d.id + '.title'); });
.each(function(d) { t.append('map_data.layers.' + d.id + '.title')(d3_select(this)); });
// Update
@@ -313,7 +313,7 @@ export function uiSectionDataLayers(context) {
var labelEnter = liEnter
.append('label')
.call(uiTooltip()
.title(t.html('map_data.layers.custom.tooltip'))
.title(() => t.append('map_data.layers.custom.tooltip'))
.placement('top')
);
@@ -330,7 +330,7 @@ export function uiSectionDataLayers(context) {
.append('button')
.attr('class', 'open-data-options')
.call(uiTooltip()
.title(t.html('settings.custom_data.tooltip'))
.title(() => t.append('settings.custom_data.tooltip'))
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
)
.on('click', function(d3_event) {
@@ -343,7 +343,7 @@ export function uiSectionDataLayers(context) {
.append('button')
.attr('class', 'zoom-to-data')
.call(uiTooltip()
.title(t.html('map_data.layers.custom.zoom'))
.title(() => t.append('map_data.layers.custom.zoom'))
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
)
.on('click', function(d3_event) {
@@ -400,7 +400,7 @@ export function uiSectionDataLayers(context) {
.attr('class', 'history-panel-toggle-item')
.append('label')
.call(uiTooltip()
.title(t.html('map_data.history_panel.tooltip'))
.title(() => t.append('map_data.history_panel.tooltip'))
.keys([uiCmd('⌘⇧' + t('info_panels.history.key'))])
.placement('top')
);
@@ -422,7 +422,7 @@ export function uiSectionDataLayers(context) {
.attr('class', 'measurement-panel-toggle-item')
.append('label')
.call(uiTooltip()
.title(t.html('map_data.measurement_panel.tooltip'))
.title(() => t.append('map_data.measurement_panel.tooltip'))
.keys([uiCmd('⌘⇧' + t('info_panels.measurement.key'))])
.placement('top')
);
modules/ui/sections/entity_issues.js
+5 -4
View File
@@ -24,7 +24,7 @@ export function uiSectionEntityIssues(context) {
return _issues.length > 0;
})
.label(function() {
return t.html('inspector.title_count', { title: { html: t.html('issues.list_title') }, count: _issues.length });
return t.append('inspector.title_count', { title: t('issues.list_title'), count: _issues.length });
})
.disclosureContent(renderDisclosureContent);
@@ -180,8 +180,9 @@ export function uiSectionEntityIssues(context) {
.classed('active', function(d) { return d.id === _activeIssueID; });
containers.selectAll('.issue-message')
.html(function(d) {
return d.message(context);
.text('')
.each(function(d) {
return d.message(context)(d3_select(this));
});
// fixes
@@ -242,7 +243,7 @@ export function uiSectionEntityIssues(context) {
buttons
.append('span')
.attr('class', 'fix-message')
.html(function(d) { return d.title; });
.each(function(d) { return d.title(d3_select(this)); });
fixesEnter.merge(fixes)
.selectAll('button')
modules/ui/sections/feature_type.js
+7 -5
View File
@@ -1,4 +1,5 @@
import { dispatch as d3_dispatch } from 'd3-dispatch';
import { select as d3_select } from 'd3-selection';
import { presetManager } from '../../presets';
import { utilArrayIdentical } from '../../util/array';
@@ -20,7 +21,7 @@ export function uiSectionFeatureType(context) {
var _tagReference;
var section = uiSection('feature-type', context)
.label(t.html('inspector.feature_type'))
.label(() => t.append('inspector.feature_type'))
.disclosureContent(renderDisclosureContent);
function renderDisclosureContent(selection) {
@@ -39,7 +40,7 @@ export function uiSectionFeatureType(context) {
.append('button')
.attr('class', 'preset-list-button preset-reset')
.call(uiTooltip()
.title(t.html('inspector.back_tooltip'))
.title(() => t.append('inspector.back_tooltip'))
.placement('bottom')
);
@@ -95,11 +96,11 @@ export function uiSectionFeatureType(context) {
var names = _presets.length === 1 ? [
_presets[0].nameLabel(),
_presets[0].subtitleLabel()
].filter(Boolean) : [t('inspector.multiple_types')];
].filter(Boolean) : [ t.append('inspector.multiple_types') ];
var label = selection.select('.label-inner');
var nameparts = label.selectAll('.namepart')
.data(names, function(d) { return d; });
.data(names, d => d.stringId);
nameparts.exit()
.remove();
@@ -108,7 +109,8 @@ export function uiSectionFeatureType(context) {
.enter()
.append('div')
.attr('class', 'namepart')
.html(function(d) { return d; });
.text('')
.each(function(d) { d(d3_select(this)); });
}
section.entityIDs = function(val) {
modules/ui/sections/map_features.js
+7 -4
View File
@@ -7,7 +7,7 @@ export function uiSectionMapFeatures(context) {
var _features = context.features().keys();
var section = uiSection('map-features', context)
.label(t.html('map_data.map_features'))
.label(() => t.append('map_data.map_features'))
.disclosureContent(renderDisclosureContent)
.expandedByDefault(false);
@@ -71,10 +71,13 @@ export function uiSectionMapFeatures(context) {
.append('li')
.call(uiTooltip()
.title(function(d) {
var tip = t.html(name + '.' + d + '.tooltip');
var tip = t.append(name + '.' + d + '.tooltip');
if (autoHiddenFeature(d)) {
var msg = showsLayer('osm') ? t.html('map_data.autohidden') : t.html('map_data.osmhidden');
tip += '<div>' + msg + '</div>';
var msg = showsLayer('osm') ? t.append('map_data.autohidden') : t.append('map_data.osmhidden');
return selection => {
selection.call(tip);
selection.append('div').call(msg);
};
}
return tip;
})
modules/ui/sections/map_style_options.js
+2 -2
View File
@@ -5,7 +5,7 @@ import { uiSection } from '../section';
export function uiSectionMapStyleOptions(context) {
var section = uiSection('fill-area', context)
.label(t.html('map_data.style_options'))
.label(() => t.append('map_data.style_options'))
.disclosureContent(renderDisclosureContent)
.expandedByDefault(false);
@@ -44,7 +44,7 @@ export function uiSectionMapStyleOptions(context) {
.append('li')
.call(uiTooltip()
.title(function(d) {
return t.html(name + '.' + d + '.tooltip');
return t.append(name + '.' + d + '.tooltip');
})
.keys(function(d) {
var key = (d === 'wireframe' ? t('area_fill.wireframe.key') : null);
modules/ui/sections/overlay_list.js
+3 -3
View File
@@ -11,7 +11,7 @@ import { uiSection } from '../section';
export function uiSectionOverlayList(context) {
var section = uiSection('overlay-list', context)
.label(t.html('background.overlays'))
.label(() => t.append('background.overlays'))
.disclosureContent(renderDisclosureContent);
var _overlayList = d3_select(null);
@@ -29,7 +29,7 @@ export function uiSectionOverlayList(context) {
if (description || isOverflowing) {
item.call(uiTooltip()
.placement(placement)
.title(description || d.name())
.title(() => description || d.name())
);
}
});
@@ -80,7 +80,7 @@ export function uiSectionOverlayList(context) {
label
.append('span')
.html(function(d) { return d.label(); });
.each(function(d) { d.label()(d3_select(this)); });
layerList.selectAll('li')
modules/ui/sections/photo_overlays.js
+7 -7
View File
@@ -12,7 +12,7 @@ export function uiSectionPhotoOverlays(context) {
var layers = context.layers();
var section = uiSection('photo-overlays', context)
.label(t.html('photo_overlays.title'))
.label(() => t.append('photo_overlays.title'))
.disclosureContent(renderDisclosureContent)
.expandedByDefault(false);
@@ -77,7 +77,7 @@ export function uiSectionPhotoOverlays(context) {
else titleID = d.id.replace(/-/g, '_') + '.tooltip';
d3_select(this)
.call(uiTooltip()
.title(t.html(titleID))
.title(() => t.append(titleID))
.placement('top')
);
});
@@ -139,7 +139,7 @@ export function uiSectionPhotoOverlays(context) {
.each(function(d) {
d3_select(this)
.call(uiTooltip()
.title(t.html('photo_overlays.photo_type.' + d + '.tooltip'))
.title(() => t.append('photo_overlays.photo_type.' + d + '.tooltip'))
.placement('top')
);
});
@@ -200,15 +200,15 @@ export function uiSectionPhotoOverlays(context) {
.each(function(d) {
d3_select(this)
.call(uiTooltip()
.title(t.html('photo_overlays.date_filter.' + d + '.tooltip'))
.title(() => t.append('photo_overlays.date_filter.' + d + '.tooltip'))
.placement('top')
);
});
labelEnter
.append('span')
.html(function(d) {
return t.html('photo_overlays.date_filter.' + d + '.title');
.each(function(d) {
t.append('photo_overlays.date_filter.' + d + '.title')(d3_select(this));
});
labelEnter
@@ -266,7 +266,7 @@ export function uiSectionPhotoOverlays(context) {
.each(function() {
d3_select(this)
.call(uiTooltip()
.title(t.html('photo_overlays.username_filter.tooltip'))
.title(() => t.append('photo_overlays.username_filter.tooltip'))
.placement('top')
);
});
modules/ui/sections/preset_fields.js
+2 -2
View File
@@ -12,7 +12,7 @@ import { uiSection } from '../section';
export function uiSectionPresetFields(context) {
var section = uiSection('preset-fields', context)
.label(t.html('inspector.fields'))
.label(() => t.append('inspector.fields'))
.disclosureContent(renderDisclosureContent);
var dispatch = d3_dispatch('change', 'revert');
@@ -81,7 +81,7 @@ export function uiSectionPresetFields(context) {
var additionalFields = utilArrayUnion(sharedMoreFields, presetsManager.universal());
additionalFields.sort(function(field1, field2) {
return field1.label().localeCompare(field2.label(), localizer.localeCode());
return field1.title().localeCompare(field2.title(), localizer.localeCode());
});
additionalFields.forEach(function(field) {
modules/ui/sections/privacy.js
+2 -2
View File
@@ -6,7 +6,7 @@ import { uiSection } from '../section';
export function uiSectionPrivacy(context) {
let section = uiSection('preferences-third-party', context)
.label(t.html('preferences.privacy.title'))
.label(() => t.append('preferences.privacy.title'))
.disclosureContent(renderDisclosureContent);
function renderDisclosureContent(selection) {
@@ -25,7 +25,7 @@ export function uiSectionPrivacy(context) {
.attr('class', 'privacy-third-party-icons-item')
.append('label')
.call(uiTooltip()
.title(t.html('preferences.privacy.third_party_icons.tooltip'))
.title(() => t.append('preferences.privacy.third_party_icons.tooltip'))
.placement('bottom')
);
modules/ui/sections/raw_member_editor.js
+1 -1
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.html('inspector.title_count', { title: { html: t.html('inspector.members') }, count: count });
return t.append('inspector.title_count', { title: t('inspector.members'), count: count });
})
.disclosureContent(renderDisclosureContent);
modules/ui/sections/raw_membership_editor.js
+4 -2
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.html('inspector.title_count', { title: { html: t.html('inspector.relations') }, count: count });
return t.append('inspector.title_count', { title: t('inspector.relations'), count: count });
})
.disclosureContent(renderDisclosureContent);
@@ -469,7 +469,9 @@ export function uiSectionRawMembershipEditor(context) {
addRelationButton
.call(svgIcon('#iD-icon-plus', 'light'));
addRelationButton
.call(uiTooltip().title(t.html('inspector.add_to_relation')).placement(localizer.textDirection() === 'ltr' ? 'right' : 'left'));
.call(uiTooltip()
.title(() => t.append('inspector.add_to_relation'))
.placement(localizer.textDirection() === 'ltr' ? 'right' : 'left'));
addRowEnter
.append('div')
modules/ui/sections/raw_tag_editor.js
+4 -2
View File
@@ -19,7 +19,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.html('inspector.title_count', { title: { html: t.html('inspector.tags') }, count: count });
return t.append('inspector.title_count', { title: t('inspector.tags'), count: count });
})
.expandedByDefault(false)
.disclosureContent(renderDisclosureContent);
@@ -165,7 +165,9 @@ export function uiSectionRawTagEditor(id, context) {
.attr('class', 'add-tag')
.attr('aria-label', t('inspector.add_to_tag'))
.call(svgIcon('#iD-icon-plus', 'light'))
.call(uiTooltip().title(t.html('inspector.add_to_tag')).placement(localizer.textDirection() === 'ltr' ? 'right' : 'left'))
.call(uiTooltip()
.title(() => t.append('inspector.add_to_tag'))
.placement(localizer.textDirection() === 'ltr' ? 'right' : 'left'))
.on('click', addTag);
addRowEnter
modules/ui/sections/selection_list.js
+1 -1
View File
@@ -17,7 +17,7 @@ export function uiSectionSelectionList(context) {
return _selectedIDs.length > 1;
})
.label(function() {
return t.html('inspector.title_count', { title: { html: t.html('inspector.features') }, count: _selectedIDs.length });
return t.append('inspector.title_count', { title: t('inspector.features'), count: _selectedIDs.length });
})
.disclosureContent(renderDisclosureContent);
modules/ui/sections/validation_issues.js
+4 -3
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.html('inspector.title_count', { title: { html: t.html('issues.' + severity + 's.list_title') }, count: issueCountText });
return t.append('inspector.title_count', { title: t('issues.' + severity + 's.list_title'), count: issueCountText });
})
.disclosureContent(renderDisclosureContent)
.shouldDisplay(function() {
@@ -146,8 +146,9 @@ export function uiSectionValidationIssues(id, severity, context) {
.order();
items.selectAll('.issue-message')
.html(function(d) {
return d.message(context);
.text('')
.each(function(d) {
return d.message(context)(d3_select(this));
});
/*
modules/ui/sections/validation_rules.js
+2 -2
View File
@@ -16,7 +16,7 @@ export function uiSectionValidationRules(context) {
var section = uiSection('issues-rules', context)
.disclosureContent(renderDisclosureContent)
.label(t.html('issues.rules.title'));
.label(() => t.append('issues.rules.title'));
var _ruleKeys = context.validator().getRuleKeys()
.filter(function(key) { return key !== 'maprules'; })
@@ -87,7 +87,7 @@ export function uiSectionValidationRules(context) {
if (name === 'rule') {
enter
.call(uiTooltip()
.title(function(d) { return t.html('issues.' + d + '.tip'); })
.title(function(d) { return t.append('issues.' + d + '.tip'); })
.placement('top')
);
}
modules/ui/splash.js
+1 -1
View File
@@ -66,7 +66,7 @@ export function uiSplash(context) {
}));
uiSectionPrivacy(context)
.label(t.html('splash.privacy_settings'))
.label(() => t.append('splash.privacy_settings'))
.render(modalSection);
let buttonWrap = introModal
modules/ui/success.js
+1 -1
View File
@@ -261,7 +261,7 @@ export function uiSuccess(context) {
.call(uiDisclosure(context, `community-more-${d.id}`, false)
.expanded(false)
.updatePreference(false)
.label(t.html('success.more'))
.label(() => t.append('success.more'))
.content(showMore)
);
}
modules/ui/tools/modes.js
+9 -8
View File
@@ -18,28 +18,28 @@ export function uiToolDrawModes(context) {
var tool = {
id: 'old_modes',
label: t.html('toolbar.add_feature')
label: t.append('toolbar.add_feature')
};
var modes = [
modeAddPoint(context, {
title: t.html('modes.add_point.title'),
title: t.append('modes.add_point.title'),
button: 'point',
description: t.html('modes.add_point.description'),
description: t.append('modes.add_point.description'),
preset: presetManager.item('point'),
key: '1'
}),
modeAddLine(context, {
title: t.html('modes.add_line.title'),
title: t.append('modes.add_line.title'),
button: 'line',
description: t.html('modes.add_line.description'),
description: t.append('modes.add_line.description'),
preset: presetManager.item('line'),
key: '2'
}),
modeAddArea(context, {
title: t.html('modes.add_area.title'),
title: t.append('modes.add_area.title'),
button: 'area',
description: t.html('modes.add_area.description'),
description: t.append('modes.add_area.description'),
preset: presetManager.item('area'),
key: '3'
})
@@ -130,7 +130,8 @@ export function uiToolDrawModes(context) {
buttonsEnter
.append('span')
.attr('class', 'label')
.html(function(mode) { return mode.title; });
.text('')
.each(function(mode) { mode.title(d3_select(this)); });
// if we are adding/removing the buttons, check if toolbar has overflowed
if (buttons.enter().size() || buttons.exit().size()) {
modules/ui/tools/notes.js
+1 -1
View File
@@ -15,7 +15,7 @@ export function uiToolNotes(context) {
var tool = {
id: 'notes',
label: t.html('modes.add_note.label')
label: t.append('modes.add_note.label')
};
var mode = modeAddNote(context);
modules/ui/tools/save.js
+4 -4
View File
@@ -11,7 +11,7 @@ export function uiToolSave(context) {
var tool = {
id: 'save',
label: t.html('save.title')
label: t.append('save.title')
};
var button = null;
@@ -57,7 +57,7 @@ export function uiToolSave(context) {
if (tooltipBehavior) {
tooltipBehavior
.title(t.html(_numChanges > 0 ? 'save.help' : 'save.no_changes'))
.title(() => t.append(_numChanges > 0 ? 'save.help' : 'save.no_changes'))
.keys([key]);
}
@@ -75,7 +75,7 @@ export function uiToolSave(context) {
tool.render = function(selection) {
tooltipBehavior = uiTooltip()
.placement('bottom')
.title(t.html('save.no_changes'))
.title(() => t.append('save.no_changes'))
.keys([key])
.scrollContainer(context.container().select('.top-toolbar'));
@@ -99,7 +99,7 @@ export function uiToolSave(context) {
.duration(2000)
.iconName('#iD-icon-save')
.iconClass('disabled')
.label(t.html('save.no_changes'))();
.label(t.append('save.no_changes'))();
}
lastPointerUpType = null;
})
modules/ui/tools/sidebar_toggle.js
+2 -2
View File
@@ -6,7 +6,7 @@ export function uiToolSidebarToggle(context) {
var tool = {
id: 'sidebar_toggle',
label: t.html('toolbar.inspect')
label: t.append('toolbar.inspect')
};
tool.render = function(selection) {
@@ -19,7 +19,7 @@ export function uiToolSidebarToggle(context) {
})
.call(uiTooltip()
.placement('bottom')
.title(t.html('sidebar.tooltip'))
.title(() => t.append('sidebar.tooltip'))
.keys([t('sidebar.key')])
.scrollContainer(context.container().select('.top-toolbar'))
)
modules/ui/tools/undo_redo.js
+7 -7
View File
@@ -14,7 +14,7 @@ export function uiToolUndoRedo(context) {
var tool = {
id: 'undo_redo',
label: t.html('toolbar.undo_redo')
label: t.append('toolbar.undo_redo')
};
var commands = [{
@@ -50,8 +50,8 @@ export function uiToolUndoRedo(context) {
.placement('bottom')
.title(function (d) {
return d.annotation() ?
t.html(d.id + '.tooltip', { action: d.annotation() }) :
t.html(d.id + '.nothing');
t.append(d.id + '.tooltip', { action: d.annotation() }) :
t.append(d.id + '.nothing');
})
.keys(function(d) {
return [d.cmd];
@@ -84,14 +84,14 @@ export function uiToolUndoRedo(context) {
) {
// there are no tooltips for touch interactions so flash feedback instead
var text = annotation ?
t.html(d.id + '.tooltip', { action: annotation }) :
t.html(d.id + '.nothing');
var label = annotation ?
t.append(d.id + '.tooltip', { action: annotation }) :
t.append(d.id + '.nothing');
context.ui().flash
.duration(2000)
.iconName('#' + d.icon)
.iconClass(annotation ? '' : 'disabled')
.label(text)();
.label(label)();
}
lastPointerUpType = null;
})
modules/ui/tooltip.js
+8 -3
View File
@@ -45,6 +45,9 @@ export function uiTooltip(klass) {
var text = _title.apply(this, arguments);
var keys = _keys.apply(this, arguments);
var headingCallback = typeof heading === 'function' ? heading : s => s.text(heading);
var textCallback = typeof text === 'function' ? text : s => s.text(text);
return function(selection) {
var headingSelect = selection
@@ -58,7 +61,8 @@ export function uiTooltip(klass) {
.append('div')
.attr('class', 'tooltip-heading')
.merge(headingSelect)
.html(heading);
.text('')
.call(headingCallback);
var textSelect = selection
.selectAll('.tooltip-text')
@@ -71,7 +75,8 @@ export function uiTooltip(klass) {
.append('div')
.attr('class', 'tooltip-text')
.merge(textSelect)
.html(text);
.text('')
.call(textCallback);
var keyhintWrap = selection
.selectAll('.keyhint-wrap')
@@ -95,7 +100,7 @@ export function uiTooltip(klass) {
.enter()
.append('kbd')
.attr('class', 'shortcut')
.html(function(d) {
.text(function(d) {
return d;
});
};
modules/ui/top_toolbar.js
+1 -3
View File
@@ -85,9 +85,7 @@ export function uiTopToolbar(context) {
actionableItems
.append('div')
.attr('class', 'item-label')
.html(function(d) {
return d.label;
});
.each(function(d) { d.label(d3_select(this)); });
}
}
modules/ui/version.js
+1 -1
View File
@@ -43,7 +43,7 @@ export function uiVersion(context) {
.attr('href', 'https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#whats-new')
.call(svgIcon('#maki-gift'))
.call(uiTooltip()
.title(t.html('version.whats_new', { version: currVersion }))
.title(() => t.append('version.whats_new', { version: currVersion }))
.placement('top')
.scrollContainer(context.container().select('.main-footer-wrap'))
);
modules/ui/zoom.js
+4 -4
View File
@@ -14,22 +14,22 @@ export function uiZoom(context) {
var zooms = [{
id: 'zoom-in',
icon: 'iD-icon-plus',
title: t.html('zoom.in'),
title: t.append('zoom.in'),
action: zoomIn,
disabled: function() {
return !context.map().canZoomIn();
},
disabledTitle: t.html('zoom.disabled.in'),
disabledTitle: t.append('zoom.disabled.in'),
key: '+'
}, {
id: 'zoom-out',
icon: 'iD-icon-minus',
title: t.html('zoom.out'),
title: t.append('zoom.out'),
action: zoomOut,
disabled: function() {
return !context.map().canZoomOut();
},
disabledTitle: t.html('zoom.disabled.out'),
disabledTitle: t.append('zoom.disabled.out'),
key: '-'
}];
modules/ui/zoom_to_selection.js
+3 -3
View File
@@ -24,7 +24,7 @@ export function uiZoomToSelection(context) {
.duration(2000)
.iconName('#iD-icon-framed-dot')
.iconClass('disabled')
.label(t.html('inspector.zoom_to.no_selection'))();
.label(t.append('inspector.zoom_to.no_selection'))();
}
} else {
var mode = context.mode();
@@ -42,9 +42,9 @@ export function uiZoomToSelection(context) {
.placement((localizer.textDirection() === 'rtl') ? 'right' : 'left')
.title(function() {
if (isDisabled()) {
return t.html('inspector.zoom_to.no_selection');
return t.append('inspector.zoom_to.no_selection');
}
return t.html('inspector.zoom_to.title');
return t.append('inspector.zoom_to.title');
})
.keys([t('inspector.zoom_to.key')]);
modules/validations/almost_junction.js
+3 -3
View File
@@ -55,12 +55,12 @@ export function validationAlmostJunction(context) {
message: function(context) {
const entity1 = context.hasEntity(this.entityIds[0]);
if (this.entityIds[0] === this.entityIds[2]) {
return entity1 ? t.html('issues.almost_junction.self.message', {
return entity1 ? t.append('issues.almost_junction.self.message', {
feature: utilDisplayLabel(entity1, context.graph())
}) : '';
} else {
const entity2 = context.hasEntity(this.entityIds[2]);
return (entity1 && entity2) ? t.html('issues.almost_junction.message', {
return (entity1 && entity2) ? t.append('issues.almost_junction.message', {
feature: utilDisplayLabel(entity1, context.graph()),
feature2: utilDisplayLabel(entity2, context.graph())
}) : '';
@@ -88,7 +88,7 @@ export function validationAlmostJunction(context) {
function makeFixes(context) {
let fixes = [new validationIssueFix({
icon: 'iD-icon-abutment',
title: t.html('issues.fix.connect_features.title'),
title: t.append('issues.fix.connect_features.title'),
onClick: function(context) {
const annotation = t('issues.fix.connect_almost_junction.annotation');
const [, endNodeId, crossWayId] = this.issue.entityIds;
modules/validations/close_nodes.js
+6 -6
View File
@@ -172,7 +172,7 @@ export function validationCloseNodes(context) {
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]),
entity2 = context.hasEntity(this.entityIds[1]);
return (entity && entity2) ? t.html('issues.close_nodes.detached.message', {
return (entity && entity2) ? t.append('issues.close_nodes.detached.message', {
feature: utilDisplayLabel(entity, context.graph()),
feature2: utilDisplayLabel(entity2, context.graph())
}) : '';
@@ -183,11 +183,11 @@ export function validationCloseNodes(context) {
return [
new validationIssueFix({
icon: 'iD-operation-disconnect',
title: t.html('issues.fix.move_points_apart.title')
title: t.append('issues.fix.move_points_apart.title')
}),
new validationIssueFix({
icon: 'iD-icon-layers',
title: t.html('issues.fix.use_different_layers_or_levels.title')
title: t.append('issues.fix.use_different_layers_or_levels.title')
})
];
}
@@ -237,7 +237,7 @@ export function validationCloseNodes(context) {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.close_nodes.message', { way: utilDisplayLabel(entity, context.graph()) }) : '';
return entity ? t.append('issues.close_nodes.message', { way: utilDisplayLabel(entity, context.graph()) }) : '';
},
reference: showReference,
entityIds: [way.id, node1.id, node2.id],
@@ -246,7 +246,7 @@ export function validationCloseNodes(context) {
return [
new validationIssueFix({
icon: 'iD-icon-plus',
title: t.html('issues.fix.merge_points.title'),
title: t.append('issues.fix.merge_points.title'),
onClick: function(context) {
var entityIds = this.issue.entityIds;
var action = actionMergeNodes([entityIds[1], entityIds[2]]);
@@ -255,7 +255,7 @@ export function validationCloseNodes(context) {
}),
new validationIssueFix({
icon: 'iD-operation-disconnect',
title: t.html('issues.fix.move_points_apart.title')
title: t.append('issues.fix.move_points_apart.title')
})
];
}
modules/validations/crossing_ways.js
+6 -6
View File
@@ -407,7 +407,7 @@ export function validationCrossingWays(context) {
var graph = context.graph();
var entity1 = graph.hasEntity(this.entityIds[0]),
entity2 = graph.hasEntity(this.entityIds[1]);
return (entity1 && entity2) ? t.html('issues.crossing_ways.message', {
return (entity1 && entity2) ? t.append('issues.crossing_ways.message', {
feature: utilDisplayLabel(entity1, graph),
feature2: utilDisplayLabel(entity2, graph)
}) : '';
@@ -440,7 +440,7 @@ export function validationCrossingWays(context) {
if (isCrossingIndoors) {
fixes.push(new validationIssueFix({
icon: 'iD-icon-layers',
title: t.html('issues.fix.use_different_levels.title')
title: t.append('issues.fix.use_different_levels.title')
}));
} else if (isCrossingTunnels ||
isCrossingBridges ||
@@ -469,7 +469,7 @@ export function validationCrossingWays(context) {
// repositioning the features is always an option
fixes.push(new validationIssueFix({
icon: 'iD-operation-move',
title: t.html('issues.fix.reposition_features.title')
title: t.append('issues.fix.reposition_features.title')
}));
return fixes;
@@ -489,7 +489,7 @@ export function validationCrossingWays(context) {
function makeAddBridgeOrTunnelFix(fixTitleID, iconName, bridgeOrTunnel){
return new validationIssueFix({
icon: iconName,
title: t.html('issues.fix.' + fixTitleID + '.title'),
title: t.append('issues.fix.' + fixTitleID + '.title'),
onClick: function(context) {
var mode = context.mode();
if (!mode || mode.id !== 'select') return;
@@ -698,7 +698,7 @@ export function validationCrossingWays(context) {
return new validationIssueFix({
icon: 'iD-icon-crossing',
title: t.html('issues.fix.' + fixTitleID + '.title'),
title: t.append('issues.fix.' + fixTitleID + '.title'),
onClick: function(context) {
var loc = this.issue.loc;
var connectionTags = this.issue.data.connectionTags;
@@ -742,7 +742,7 @@ export function validationCrossingWays(context) {
function makeChangeLayerFix(higherOrLower) {
return new validationIssueFix({
icon: 'iD-icon-' + (higherOrLower === 'higher' ? 'up' : 'down'),
title: t.html('issues.fix.tag_this_as_' + higherOrLower + '.title'),
title: t.append('issues.fix.tag_this_as_' + higherOrLower + '.title'),
onClick: function(context) {
var mode = context.mode();
modules/validations/disconnected_way.js
+5 -5
View File
@@ -25,7 +25,7 @@ export function validationDisconnectedWay() {
message: function(context) {
var entity = this.entityIds.length && context.hasEntity(this.entityIds[0]);
var label = entity && utilDisplayLabel(entity, context.graph());
return t.html('issues.disconnected_way.routable.message', { count: this.entityIds.length, highway: label });
return t.append('issues.disconnected_way.routable.message', { count: this.entityIds.length, highway: label });
},
reference: showReference,
entityIds: Array.from(routingIslandWays).map(function(way) { return way.id; }),
@@ -53,13 +53,13 @@ export function validationDisconnectedWay() {
}
if (!fixes.length) {
fixes.push(new validationIssueFix({
title: t.html('issues.fix.connect_feature.title')
title: t.append('issues.fix.connect_feature.title')
}));
}
fixes.push(new validationIssueFix({
icon: 'iD-operation-delete',
title: t.html('issues.fix.delete_feature.title'),
title: t.append('issues.fix.delete_feature.title'),
entityIds: [singleEntity.id],
onClick: function(context) {
var id = this.issue.entityIds[0];
@@ -71,7 +71,7 @@ export function validationDisconnectedWay() {
}));
} else {
fixes.push(new validationIssueFix({
title: t.html('issues.fix.connect_features.title')
title: t.append('issues.fix.connect_features.title')
}));
}
@@ -184,7 +184,7 @@ export function validationDisconnectedWay() {
return new validationIssueFix({
icon: 'iD-operation-continue' + (useLeftContinue ? '-left' : ''),
title: t.html('issues.fix.continue_from_' + whichEnd + '.title'),
title: t.append('issues.fix.continue_from_' + whichEnd + '.title'),
entityIds: [vertexID],
onClick: function(context) {
var wayId = this.issue.entityIds[0];
modules/validations/help_request.js
+2 -2
View File
@@ -25,14 +25,14 @@ export function validationHelpRequest(context) {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.fixme_tag.message', {
return entity ? t.append('issues.fixme_tag.message', {
feature: utilDisplayLabel(entity, context.graph(), true /* verbose */)
}) : '';
},
dynamicFixes: function() {
return [
new validationIssueFix({
title: t.html('issues.fix.address_the_concern.title')
title: t.append('issues.fix.address_the_concern.title')
})
];
},
modules/validations/impossible_oneway.js
+3 -3
View File
@@ -162,7 +162,7 @@ export function validationImpossibleOneway() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.impossible_oneway.' + messageID + '.message', {
return entity ? t.append('issues.impossible_oneway.' + messageID + '.message', {
feature: utilDisplayLabel(entity, context.graph())
}) : '';
},
@@ -175,7 +175,7 @@ export function validationImpossibleOneway() {
if (attachedOneways.length) {
fixes.push(new validationIssueFix({
icon: 'iD-operation-reverse',
title: t.html('issues.fix.reverse_feature.title'),
title: t.append('issues.fix.reverse_feature.title'),
entityIds: [way.id],
onClick: function(context) {
var id = this.issue.entityIds[0];
@@ -189,7 +189,7 @@ export function validationImpossibleOneway() {
(!isFirst && textDirection === 'rtl');
fixes.push(new validationIssueFix({
icon: 'iD-operation-continue' + (useLeftContinue ? '-left' : ''),
title: t.html('issues.fix.continue_from_' + (isFirst ? 'start' : 'end') + '.title'),
title: t.append('issues.fix.continue_from_' + (isFirst ? 'start' : 'end') + '.title'),
onClick: function(context) {
var entityID = this.issue.entityIds[0];
var vertexID = this.issue.entityIds[1];
modules/validations/incompatible_source.js
+2 -2
View File
@@ -43,7 +43,7 @@ export function validationIncompatibleSource() {
severity: 'warning',
message: (context) => {
const entity = context.hasEntity(entityID);
return entity ? t.html('issues.incompatible_source.feature.message', {
return entity ? t.append('issues.incompatible_source.feature.message', {
feature: utilDisplayLabel(entity, context.graph(), true /* verbose */),
value: source
}) : '';
@@ -53,7 +53,7 @@ export function validationIncompatibleSource() {
hash: source,
dynamicFixes: () => {
return [
new validationIssueFix({ title: t.html('issues.fix.remove_proprietary_data.title') })
new validationIssueFix({ title: t.append('issues.fix.remove_proprietary_data.title') })
];
}
});
modules/validations/invalid_format.js
+2 -2
View File
@@ -55,7 +55,7 @@ export function validationFormatting() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.invalid_format.website.message' + this.data,
return entity ? t.append('issues.invalid_format.website.message' + this.data,
{ feature: utilDisplayLabel(entity, context.graph()), site: websites.join(', ') }) : '';
},
reference: showReferenceWebsite,
@@ -80,7 +80,7 @@ export function validationFormatting() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.invalid_format.email.message' + this.data,
return entity ? t.append('issues.invalid_format.email.message' + this.data,
{ feature: utilDisplayLabel(entity, context.graph()), email: emails.join(', ') }) : '';
},
reference: showReferenceEmail,
modules/validations/mismatched_geometry.js
+9 -9
View File
@@ -88,7 +88,7 @@ export function validationMismatchedGeometry() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.tag_suggests_area.message', {
return entity ? t.append('issues.tag_suggests_area.message', {
feature: utilDisplayLabel(entity, 'area', true /* verbose */),
tag: utilTagText({ tags: tagSuggestingArea })
}) : '';
@@ -104,13 +104,13 @@ export function validationMismatchedGeometry() {
var connectEndsOnClick = makeConnectEndpointsFixOnClick(entity, context.graph());
fixes.push(new validationIssueFix({
title: t.html('issues.fix.connect_endpoints.title'),
title: t.append('issues.fix.connect_endpoints.title'),
onClick: connectEndsOnClick
}));
fixes.push(new validationIssueFix({
icon: 'iD-operation-delete',
title: t.html('issues.fix.remove_tag.title'),
title: t.append('issues.fix.remove_tag.title'),
onClick: function(context) {
var entityId = this.issue.entityIds[0];
var entity = context.entity(entityId);
@@ -161,7 +161,7 @@ export function validationMismatchedGeometry() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.vertex_as_point.message', {
return entity ? t.append('issues.vertex_as_point.message', {
feature: utilDisplayLabel(entity, 'vertex', true /* verbose */)
}) : '';
},
@@ -184,7 +184,7 @@ export function validationMismatchedGeometry() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.point_as_vertex.message', {
return entity ? t.append('issues.point_as_vertex.message', {
feature: utilDisplayLabel(entity, 'point', true /* verbose */)
}) : '';
},
@@ -264,7 +264,7 @@ export function validationMismatchedGeometry() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.' + referenceId + '.message', {
return entity ? t.append('issues.' + referenceId + '.message', {
feature: utilDisplayLabel(entity, targetGeom, true /* verbose */)
}) : '';
},
@@ -308,7 +308,7 @@ export function validationMismatchedGeometry() {
return [
new validationIssueFix({
icon: 'iD-icon-line',
title: t.html('issues.fix.convert_to_line.title'),
title: t.append('issues.fix.convert_to_line.title'),
onClick: convertOnClick
})
];
@@ -336,7 +336,7 @@ export function validationMismatchedGeometry() {
return [
new validationIssueFix({
icon: 'iD-operation-extract',
title: t.html('issues.fix.extract_point.title'),
title: t.append('issues.fix.extract_point.title'),
onClick: extractOnClick
})
];
@@ -371,7 +371,7 @@ export function validationMismatchedGeometry() {
severity: 'warning',
message: function(context) {
var entity = context.hasEntity(this.entityIds[0]);
return entity ? t.html('issues.unclosed_multipolygon_part.message', {
return entity ? t.append('issues.unclosed_multipolygon_part.message', {
feature: utilDisplayLabel(entity, context.graph(), true /* verbose */)
}) : '';
},
modules/validations/missing_role.js
+3 -3
View File
@@ -44,7 +44,7 @@ export function validationMissingRole() {
message: function(context) {
var member = context.hasEntity(this.entityIds[1]),
relation = context.hasEntity(this.entityIds[0]);
return (member && relation) ? t.html('issues.missing_role.message', {
return (member && relation) ? t.append('issues.missing_role.message', {
member: utilDisplayLabel(member, context.graph()),
relation: utilDisplayLabel(relation, context.graph())
}) : '';
@@ -61,7 +61,7 @@ export function validationMissingRole() {
makeAddRoleFix('outer'),
new validationIssueFix({
icon: 'iD-operation-delete',
title: t.html('issues.fix.remove_from_relation.title'),
title: t.append('issues.fix.remove_from_relation.title'),
onClick: function(context) {
context.perform(
actionDeleteMember(this.issue.entityIds[0], this.issue.data.member.index),
@@ -89,7 +89,7 @@ export function validationMissingRole() {
function makeAddRoleFix(role) {
return new validationIssueFix({
title: t.html('issues.fix.set_as_' + role + '.title'),
title: t.append('issues.fix.set_as_' + role + '.title'),
onClick: function(context) {
var oldMember = this.issue.data.member;
var member = { id: this.issue.entityIds[1], type: oldMember.type, role: role };

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