From 0d5d0b19fc67cdb3e0fa0834c280b3f010612f6a Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@7thposition.com>
Date: Mon, 21 Jul 2014 15:56:03 -0400
Subject: [PATCH] Try to use strings when generating placeholder

---
 js/id/ui/preset/combo.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/js/id/ui/preset/combo.js b/js/id/ui/preset/combo.js
index fe0247d8e..6941b1ece 100644
--- a/js/id/ui/preset/combo.js
+++ b/js/id/ui/preset/combo.js
@@ -37,15 +37,21 @@ iD.ui.preset.typeCombo = function(field) {
             .on('change', change)
             .on('blur', change)
             .each(function() {
-                var keys = _.keys(strings);
+                var keys = _.keys(strings),
+                    strs = [],
+                    placeholders;
+
                 combobox.data(keys.map(function(k) {
-                    var o = {};
-                    o.title = o.value = strings[k];
+                    var s = strings[k],
+                        o = {};
+                    o.title = o.value = s;
+                    if (s.length < 20) { strs.push(s); }
                     return o;
                 }));
 
+                placeholders = strs.length ? strs : keys;
                 input.attr('placeholder', field.placeholder() ||
-                    (keys.length < 3 ? '' : keys.slice(0, 3).join(', ') + '...'));
+                    (placeholders.slice(0, 3).join(', ') + '...'));
             });
     }