From 5c68b2cc0f1d08fc0ec6d671eb8e863b413d2f3d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 29 Apr 2016 22:39:31 -0400
Subject: [PATCH] Avoid tabbing to field buttons in the entity editor

---
 js/id/ui/preset.js           | 1 +
 js/id/ui/preset/input.js     | 6 ++++--
 js/id/ui/preset/localized.js | 1 +
 js/id/ui/preset/wikipedia.js | 1 +
 js/id/ui/tag_reference.js    | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/js/id/ui/preset.js b/js/id/ui/preset.js
index 02ec1a0f2..a1374d497 100644
--- a/js/id/ui/preset.js
+++ b/js/id/ui/preset.js
@@ -125,6 +125,7 @@ iD.ui.preset = function(context) {
 
         wrap.append('button')
             .attr('class', 'remove-icon')
+            .attr('tabindex', -1)
             .call(iD.svg.Icon('#operation-delete'));
 
         wrap.append('button')
diff --git a/js/id/ui/preset/input.js b/js/id/ui/preset/input.js
index b65748a2b..cba65395c 100644
--- a/js/id/ui/preset/input.js
+++ b/js/id/ui/preset/input.js
@@ -32,11 +32,13 @@ iD.ui.preset.url = function(field) {
 
             enter.append('button')
                 .datum(1)
-                .attr('class', 'increment');
+                .attr('class', 'increment')
+                .attr('tabindex', -1);
 
             enter.append('button')
                 .datum(-1)
-                .attr('class', 'decrement');
+                .attr('class', 'decrement')
+                .attr('tabindex', -1);
 
             spinControl.selectAll('button')
                 .on('click', function(d) {
diff --git a/js/id/ui/preset/localized.js b/js/id/ui/preset/localized.js
index 18d27ff70..d80273a80 100644
--- a/js/id/ui/preset/localized.js
+++ b/js/id/ui/preset/localized.js
@@ -32,6 +32,7 @@ iD.ui.preset.localized = function(field, context) {
         translateButton.enter()
             .append('button')
             .attr('class', 'button-input-action localized-add minor')
+            .attr('tabindex', -1)
             .call(iD.svg.Icon('#icon-plus'))
             .call(bootstrap.tooltip()
                 .title(t('translate.translate'))
diff --git a/js/id/ui/preset/wikipedia.js b/js/id/ui/preset/wikipedia.js
index 5ac04cef3..389095814 100644
--- a/js/id/ui/preset/wikipedia.js
+++ b/js/id/ui/preset/wikipedia.js
@@ -61,6 +61,7 @@ iD.ui.preset.wikipedia = function(field, context) {
 
         link.enter().append('a')
             .attr('class', 'wiki-link button-input-action minor')
+            .attr('tabindex', -1)
             .attr('target', '_blank')
             .call(iD.svg.Icon('#icon-out-link', 'inline'));
     }
diff --git a/js/id/ui/tag_reference.js b/js/id/ui/tag_reference.js
index 2e027f811..fd95faa61 100644
--- a/js/id/ui/tag_reference.js
+++ b/js/id/ui/tag_reference.js
@@ -69,6 +69,7 @@ iD.ui.TagReference = function(tag, context) {
             body
                 .append('a')
                 .attr('target', '_blank')
+                .attr('tabindex', -1)
                 .attr('href', 'https://wiki.openstreetmap.org/wiki/' + docs.title)
                 .call(iD.svg.Icon('#icon-out-link', 'inline'))
                 .append('span')