projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/bootstrap/ComboBox.js
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
12e89a6
..
ddb0fb5
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-10685,7
+10685,7
@@
Roo.extend(Roo.bootstrap.TriggerField, Roo.bootstrap.Input, {
createList : function()
{
this.list = Roo.get(document.body).createChild({
createList : function()
{
this.list = Roo.get(document.body).createChild({
- tag: 'ul',
+ tag:
Roo.bootstrap.version == 4 ? 'div' :
'ul',
cls: 'typeahead typeahead-long dropdown-menu',
style: 'display:none'
});
cls: 'typeahead typeahead-long dropdown-menu',
style: 'display:none'
});
@@
-13631,7
+13631,9
@@
Roo.extend(Roo.bootstrap.ComboBox, Roo.bootstrap.TriggerField, {
*/
if(!this.tpl){
*/
if(!this.tpl){
- this.tpl = '<li><a class="dropdown-item" href="#">{' + this.displayField + '}</a></li>';
+ this.tpl = Roo.bootstrap.version == 4 ?
+ '<a class="dropdown-item" href="#">{' + this.displayField + '}</a>' : // 4 does not need <li> and it get's really confisued.
+ '<li><a class="dropdown-item" href="#">{' + this.displayField + '}</a></li>';
}
this.view = new Roo.View(this.list, this.tpl, {
}
this.view = new Roo.View(this.list, this.tpl, {