From: Alan Knowles <alan@roojs.com>
Date: Thu, 24 Jan 2019 08:45:00 +0000 (+0800)
Subject: Roo/bootstrap/ComboBox.js
X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=5e4eff5b88797920637f4fa975e72b8d53cd8874

Roo/bootstrap/ComboBox.js
---

diff --git a/Roo/bootstrap/ComboBox.js b/Roo/bootstrap/ComboBox.js
index 4abed621ee..2cc4386516 100644
--- a/Roo/bootstrap/ComboBox.js
+++ b/Roo/bootstrap/ComboBox.js
@@ -2283,8 +2283,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
         if(!this.multiple && this.showToggleBtn){
             
             var caret = {
-                        tag: 'span',
-                        cls: 'caret'
+                cls: 'caret'
             };
             
             if (this.caret != false) {
@@ -2299,7 +2298,7 @@ Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
                 tag :'span',
                 cls : 'input-group-addon input-group-append input-group-text btn dropdown-toggle',
                 cn : [
-                    caret,
+                    Roo.bootstrap.version == 3 ? caret : '',
                     {
                         tag: 'span',
                         cls: 'combobox-clear',