Merge branch 'develop' into accessible_ui

modules/ui/tools/save.js

@@ -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

@@ -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)