From 8883c2f36de39d6ef9a3e3b4b04d5f54f7104334 Mon Sep 17 00:00:00 2001 From: Quincy Morgan <2046746+quincylvania@users.noreply.github.com> Date: Tue, 22 Sep 2020 12:19:54 -0400 Subject: [PATCH] Fix uiFlash issues Clean up a few things from prior commit --- modules/behavior/hash.js | 6 ++---- modules/behavior/operation.js | 4 ++-- modules/core/localizer.js | 2 +- modules/modes/drag_node.js | 11 +++++++---- modules/modes/draw_area.js | 3 ++- modules/modes/draw_line.js | 3 ++- modules/modes/select.js | 4 ++-- modules/ui/edit_menu.js | 4 ++-- modules/ui/flash.js | 19 ++++++------------- modules/ui/geolocate.js | 2 +- modules/ui/init.js | 4 +++- modules/ui/tools/save.js | 2 +- modules/ui/tools/undo_redo.js | 2 +- modules/ui/zoom.js | 2 +- modules/ui/zoom_to_selection.js | 2 +- 15 files changed, 34 insertions(+), 36 deletions(-) diff --git a/modules/behavior/hash.js b/modules/behavior/hash.js index 42d27b831..e81ea9354 100644 --- a/modules/behavior/hash.js +++ b/modules/behavior/hash.js @@ -62,8 +62,7 @@ export function behaviorHash(context) { if (selected.length > 1 ) { contextual = t('title.labeled_and_more', { labeled: firstLabel, - count: (selected.length - 1).toString(), - html: false + count: (selected.length - 1).toString() }); } else { contextual = firstLabel; @@ -82,8 +81,7 @@ export function behaviorHash(context) { return t('title.format.' + titleID, { changes: changeCount, base: baseTitle, - context: contextual, - html: false + context: contextual }); } diff --git a/modules/behavior/operation.js b/modules/behavior/operation.js index f4249b254..87b4c8e6c 100644 --- a/modules/behavior/operation.js +++ b/modules/behavior/operation.js @@ -20,14 +20,14 @@ export function behaviorOperation(context) { .duration(4000) .iconName('#iD-operation-' + _operation.id) .iconClass('operation disabled') - .text(_operation.tooltip)(); + .label(_operation.tooltip)(); } else { context.ui().flash .duration(2000) .iconName('#iD-operation-' + _operation.id) .iconClass('operation') - .text(_operation.annotation() || _operation.title)(); + .label(_operation.annotation() || _operation.title)(); if (_operation.point) _operation.point(null); _operation(); diff --git a/modules/core/localizer.js b/modules/core/localizer.js index 3f31c95a3..39985b266 100644 --- a/modules/core/localizer.js +++ b/modules/core/localizer.js @@ -8,7 +8,7 @@ let _t = _mainLocalizer.t; export { _mainLocalizer as localizer, - // export `t` functions for ease-of-use + // export `t` function for ease-of-use _t as t }; diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js index dca967c4a..bab11abee 100644 --- a/modules/modes/drag_node.js +++ b/modules/modes/drag_node.js @@ -138,7 +138,8 @@ export function modeDragNode(context) { if (hasHidden) { context.ui().flash .duration(4000) - .text(t('modes.drag_node.connected_to_hidden'))(); + .iconName('#iD-icon-no') + .label(t('modes.drag_node.connected_to_hidden'))(); } return drag.cancel(); } @@ -237,7 +238,8 @@ export function modeDragNode(context) { if (!nope) { // about to nope - show hint context.ui().flash .duration(4000) - .text(t('operations.connect.' + isInvalid, + .iconName('#iD-icon-no') + .label(t('operations.connect.' + isInvalid, { relation: presetManager.item('type/restriction').name() } ))(); } @@ -245,12 +247,13 @@ export function modeDragNode(context) { var errorID = isInvalid === 'line' ? 'lines' : 'areas'; context.ui().flash .duration(3000) - .text(t('self_intersection.error.' + errorID))(); + .iconName('#iD-icon-no') + .label(t('self_intersection.error.' + errorID))(); } else { if (nope) { // about to un-nope, remove hint context.ui().flash .duration(1) - .text('')(); + .label('')(); } } diff --git a/modules/modes/draw_area.js b/modules/modes/draw_area.js index 902d4e870..e488a667f 100644 --- a/modules/modes/draw_area.js +++ b/modules/modes/draw_area.js @@ -11,7 +11,8 @@ export function modeDrawArea(context, wayID, startGraph, button) { var behavior = behaviorDrawWay(context, wayID, mode, startGraph) .on('rejectedSelfIntersection.modeDrawArea', function() { context.ui().flash - .text(t('self_intersection.error.areas'))(); + .iconName('#iD-icon-no') + .label(t('self_intersection.error.areas'))(); }); mode.wayID = wayID; diff --git a/modules/modes/draw_line.js b/modules/modes/draw_line.js index 9d7b0edfb..e629ae7d1 100644 --- a/modules/modes/draw_line.js +++ b/modules/modes/draw_line.js @@ -11,7 +11,8 @@ export function modeDrawLine(context, wayID, startGraph, button, affix, continui var behavior = behaviorDrawWay(context, wayID, mode, startGraph) .on('rejectedSelfIntersection.modeDrawLine', function() { context.ui().flash - .text(t('self_intersection.error.lines'))(); + .iconName('#iD-icon-no') + .label(t('self_intersection.error.lines'))(); }); mode.wayID = wayID; diff --git a/modules/modes/select.js b/modules/modes/select.js index 4bbebe361..b10a015de 100644 --- a/modules/modes/select.js +++ b/modules/modes/select.js @@ -305,7 +305,7 @@ export function modeSelect(context, selectedIDs) { .duration(4000) .iconName('#iD-operation-' + moveOp.id) .iconClass('operation disabled') - .text(moveOp.tooltip)(); + .label(moveOp.tooltip)(); } else { context.perform(actionMove(selectedIDs, delta, context.projection), moveOp.annotation()); context.validator().validate(); @@ -378,7 +378,7 @@ export function modeSelect(context, selectedIDs) { .duration(4000) .iconName('#iD-icon-no') .iconClass('operation disabled') - .text(t('operations.scale.' + disabled + '.' + multi))(); + .label(t('operations.scale.' + disabled + '.' + multi))(); } else { const pivot = context.projection(extent.center()); const annotation = t('operations.scale.annotation.' + (isUp ? 'up' : 'down') + '.feature', { n: selectedIDs.length }); diff --git a/modules/ui/edit_menu.js b/modules/ui/edit_menu.js index a454f5fd5..c6e78d15d 100644 --- a/modules/ui/edit_menu.js +++ b/modules/ui/edit_menu.js @@ -148,7 +148,7 @@ export function uiEditMenu(context) { .duration(4000) .iconName('#iD-operation-' + operation.id) .iconClass('operation disabled') - .html(operation.tooltip)(); + .label(operation.tooltip)(); } } else { if (lastPointerUpType === 'touch' || @@ -157,7 +157,7 @@ export function uiEditMenu(context) { .duration(2000) .iconName('#iD-operation-' + operation.id) .iconClass('operation') - .html(operation.annotation() || operation.title)(); + .label(operation.annotation() || operation.title)(); } operation(); diff --git a/modules/ui/flash.js b/modules/ui/flash.js index 152239c13..39b04a35c 100644 --- a/modules/ui/flash.js +++ b/modules/ui/flash.js @@ -6,8 +6,7 @@ export function uiFlash(context) { var _duration = 2000; var _iconName = '#iD-icon-no'; var _iconClass = 'disabled'; - var _text = ''; - var _textClass; + var _label = ''; function flash() { if (_flashTimer) { @@ -64,8 +63,8 @@ export function uiFlash(context) { content .selectAll('.flash-text') - .attr('class', 'flash-text ' + (_textClass || '')) - .html(_text); + .attr('class', 'flash-text') + .html(_label); _flashTimer = d3_timeout(function() { @@ -88,15 +87,9 @@ export function uiFlash(context) { return flash; }; - flash.text = function(_) { - if (!arguments.length) return _text; - _text = _; - return flash; - }; - - flash.textClass = function(_) { - if (!arguments.length) return _textClass; - _textClass = _; + flash.label = function(_) { + if (!arguments.length) return _label; + _label = _; return flash; }; diff --git a/modules/ui/geolocate.js b/modules/ui/geolocate.js index 433b1e97f..2388b0987 100644 --- a/modules/ui/geolocate.js +++ b/modules/ui/geolocate.js @@ -62,7 +62,7 @@ export function uiGeolocate(context) { zoomTo(); } else { context.ui().flash - .html(t.html('geolocate.location_unavailable')) + .label(t.html('geolocate.location_unavailable')) .iconName('#iD-icon-geolocate')(); } diff --git a/modules/ui/init.js b/modules/ui/init.js index b6c18feed..0d7824d97 100644 --- a/modules/ui/init.js +++ b/modules/ui/init.js @@ -127,7 +127,9 @@ export function uiInit(context) { map .on('hitMinZoom.ui', function() { - ui.flash.html(t.html('cannot_zoom'))(); + ui.flash + .iconName('#iD-icon-no') + .label(t.html('cannot_zoom'))(); }); container diff --git a/modules/ui/tools/save.js b/modules/ui/tools/save.js index bc60535ce..e2fa2a1b2 100644 --- a/modules/ui/tools/save.js +++ b/modules/ui/tools/save.js @@ -102,7 +102,7 @@ export function uiToolSave(context) { .duration(2000) .iconName('#iD-icon-save') .iconClass('disabled') - .html(t.html('save.no_changes'))(); + .label(t.html('save.no_changes'))(); } lastPointerUpType = null; }) diff --git a/modules/ui/tools/undo_redo.js b/modules/ui/tools/undo_redo.js index 55d3c278e..3f2c714be 100644 --- a/modules/ui/tools/undo_redo.js +++ b/modules/ui/tools/undo_redo.js @@ -92,7 +92,7 @@ export function uiToolUndoRedo(context) { .duration(2000) .iconName('#' + d.icon) .iconClass(annotation ? '' : 'disabled') - .html(text)(); + .label(text)(); } lastPointerUpType = null; }) diff --git a/modules/ui/zoom.js b/modules/ui/zoom.js index 856149963..10b783b91 100644 --- a/modules/ui/zoom.js +++ b/modules/ui/zoom.js @@ -89,7 +89,7 @@ export function uiZoom(context) { .duration(2000) .iconName('#' + d.icon) .iconClass('disabled') - .html(d.disabledTitle)(); + .label(d.disabledTitle)(); } lastPointerUpType = null; }) diff --git a/modules/ui/zoom_to_selection.js b/modules/ui/zoom_to_selection.js index a23324790..9bd10b410 100644 --- a/modules/ui/zoom_to_selection.js +++ b/modules/ui/zoom_to_selection.js @@ -26,7 +26,7 @@ export function uiZoomToSelection(context) { .duration(2000) .iconName('#iD-icon-framed-dot') .iconClass('disabled') - .html(t.html('inspector.zoom_to.no_selection'))(); + .label(t.html('inspector.zoom_to.no_selection'))(); } } else { var mode = context.mode();