projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
roojs-bootstrap.js
[roojs1]
/
roojs-bootstrap-debug.js
diff --git
a/roojs-bootstrap-debug.js
b/roojs-bootstrap-debug.js
index
33e39ee
..
379212b
100644
(file)
--- a/
roojs-bootstrap-debug.js
+++ b/
roojs-bootstrap-debug.js
@@
-6258,7
+6258,7
@@
Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, {
var p = this.parent();
- if (['tabs','pills'].indexOf(p.type)!==-1) {
+ if (['tabs','pills'].indexOf(p.type)!==-1
&& p.pilltype
) {
if (typeof(p.setActiveItem) !== 'undefined') {
p.setActiveItem(this);
}