From: edward <edward@roojs.com>
Date: Tue, 17 Apr 2018 08:30:19 +0000 (+0800)
Subject: Roo/bootstrap/ComboBox.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=1412f9a5c6f0d30e0ec98af2ffb601d2f5345129

Roo/bootstrap/ComboBox.js
---

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 99f4540ae1..d0cfafd80a 100644
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -2836,7 +2836,11 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
             var default_text = '-- SELECT --';
             
             if(this.placeholder.length){
-                default_text = this.placeholder + ' - ';
+                default_text = this.placeholder + ' -';
+            }
+            
+            if(this.emptyTitle.length){
+                default_text = this.emptyTitle + ' -';
             }
             
             var opt = this.inputEl().createChild({