From 963064713d285a6ef345a8364a81b4111f87c687 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 10 Jul 2014 10:00:53 -0700
Subject: [PATCH] Support placeholder for combo fields

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

diff --git a/js/id/ui/preset/combo.js b/js/id/ui/preset/combo.js
index 7189ce4b8..eda700ad9 100644
--- a/js/id/ui/preset/combo.js
+++ b/js/id/ui/preset/combo.js
@@ -36,10 +36,8 @@ iD.ui.preset.typeCombo = function(field) {
                 return o;
             }));
 
-            input.attr('placeholder', function() {
-                if (opts.length < 3) return '';
-                return opts.slice(0, 3).join(', ') + '...';
-            });
+            input.attr('placeholder', field.placeholder() ||
+                (opts.length < 3 ? '' : opts.slice(0, 3).join(', ') + '...'));
         }
     }