projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Uncommited changes synced
[roojs1]
/
Roo
/
bootstrap
/
Input.js
diff --git
a/Roo/bootstrap/Input.js
b/Roo/bootstrap/Input.js
index
6b970c1
..
21f9ea1
100644
(file)
--- a/
Roo/bootstrap/Input.js
+++ b/
Roo/bootstrap/Input.js
@@
-537,9
+537,10
@@
Roo.extend(Roo.bootstrap.Input, Roo.bootstrap.Component, {
cfg.cls += ' navbar-form';
}
cfg.cls += ' navbar-form';
}
- if (this.parentType === 'NavGroup') {
- cfg.cls += ' navbar-form';
- cfg.tag = 'li';
+ if (this.parentType === 'NavGroup' && !(Roo.bootstrap.version == 4 && this.parent().form)) {
+ // on BS4 we do this only if not form
+ cfg.cls += ' navbar-form';
+ cfg.tag = 'li';
}
return cfg;
}
return cfg;