From: edward <edward@roojs.com>
Date: Tue, 22 Mar 2016 03:13:42 +0000 (+0800)
Subject: Roo/bootstrap/ComboBox.js
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=e678dac1d30663a47256393c4f1719a88682af0a;p=roojs1

Roo/bootstrap/ComboBox.js
---

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 279b9bb9fd..723981b179 100644
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -349,7 +349,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                     tag : 'button',
                     type : 'button',
                     cls : 'btn btn-link btn-edit pull-' + this.btnPosition,
-                    html : 
+                    html : this.triggerText
                 },
                 {
                     tag : 'button',