projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3acdb82
)
Roo/bootstrap/TabPanel.js
author
Alan Knowles
<alan@roojs.com>
Wed, 4 Feb 2015 07:04:07 +0000
(15:04 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 4 Feb 2015 07:04:07 +0000
(15:04 +0800)
Roo/bootstrap/TabPanel.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/TabPanel.js
b/Roo/bootstrap/TabPanel.js
index
f113d5f
..
918f59a
100644
(file)
--- a/
Roo/bootstrap/TabPanel.js
+++ b/
Roo/bootstrap/TabPanel.js
@@
-66,8
+66,9
@@
Roo.extend(Roo.bootstrap.TabPanel, Roo.bootstrap.Component, {
Roo.log('-------- init events on tab panel ---------');
var p = this.parent();
-
- if (typeof(p.navId) != 'undefined') {
+ this.navId = this.navId || p.navId;
+
+ if (typeof(this.navId) != 'undefined') {
// not really needed.. but just in case.. parent should be a NavGroup.
var tg = Roo.bootstrap.TabGroup.get(p.navId);
this.navId = this.navId || p.navId;