projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
a47386a
)
Roo/bootstrap/ComboBox.js
author
Alan Knowles
<alan@roojs.com>
Thu, 24 Jan 2019 08:45:00 +0000
(16:45 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 24 Jan 2019 08:45:00 +0000
(16:45 +0800)
Roo/bootstrap/ComboBox.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/ComboBox.js
b/Roo/bootstrap/ComboBox.js
index
4abed62
..
2cc4386
100644
(file)
--- 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',