From d7b3bb5a8945641021c8919004e00cc6f4c2d709 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 26 Sep 2016 01:03:04 -0400
Subject: [PATCH] Fix placeholders set during enter selection not finding input
 element Also remove unhelpful placeholder from access_simple.json

---
 data/presets.yaml                      | 2 --
 data/presets/fields.json               | 1 -
 data/presets/fields/access_simple.json | 1 -
 dist/locales/en.json                   | 3 +--
 modules/ui/fields/combo.js             | 4 +++-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/data/presets.yaml b/data/presets.yaml
index b5180ed2c..63f7c7aac 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -74,8 +74,6 @@ en:
       access_simple:
         # access=*
         label: Allowed Access
-        # access_simple field placeholder
-        placeholder: 'yes'
       access_toilets:
         # access=*
         label: Access
diff --git a/data/presets/fields.json b/data/presets/fields.json
index 3d5ebf5bc..26109b5c0 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -3,7 +3,6 @@
         "key": "access",
         "type": "combo",
         "label": "Allowed Access",
-        "placeholder": "yes",
         "options": [
             "permissive",
             "private",
diff --git a/data/presets/fields/access_simple.json b/data/presets/fields/access_simple.json
index 66a25d4a9..e7cc59374 100644
--- a/data/presets/fields/access_simple.json
+++ b/data/presets/fields/access_simple.json
@@ -2,6 +2,5 @@
     "key": "access",
     "type": "combo",
     "label": "Allowed Access",
-    "placeholder": "yes",
     "options": ["permissive", "private", "customers", "no"]
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 2345ba686..2415394f2 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -650,8 +650,7 @@
         },
         "fields": {
             "access_simple": {
-                "label": "Allowed Access",
-                "placeholder": "yes"
+                "label": "Allowed Access"
             },
             "access_toilets": {
                 "label": "Access"
diff --git a/modules/ui/fields/combo.js b/modules/ui/fields/combo.js
index fbf18df32..1b230bb48 100644
--- a/modules/ui/fields/combo.js
+++ b/modules/ui/fields/combo.js
@@ -11,6 +11,7 @@ export {
     combo as multiCombo,
     combo as networkCombo
 };
+
 export function combo(field, context) {
     var dispatch = d3.dispatch('change'),
         isMulti = (field.type === 'multiCombo'),
@@ -187,7 +188,8 @@ export function combo(field, context) {
             ph = field.placeholder() || placeholders.slice(0, 3).join(', ');
         }
 
-        input.attr('placeholder', ph + '…');
+        container.selectAll('input')
+            .attr('placeholder', ph + '…');
     }