projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3ba3e3e
)
Roo/bootstrap/Navbar.Item.js
author
Julian Knowles
<julian@roojs.com>
Tue, 21 Jan 2014 06:21:53 +0000
(14:21 +0800)
committer
Julian Knowles
<julian@roojs.com>
Tue, 21 Jan 2014 06:21:53 +0000
(14:21 +0800)
Roo/bootstrap/Navbar.Item.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Navbar.Item.js
b/Roo/bootstrap/Navbar.Item.js
index
60a544f
..
cc19bf6
100644
(file)
--- a/
Roo/bootstrap/Navbar.Item.js
+++ b/
Roo/bootstrap/Navbar.Item.js
@@
-29,8
+29,10
@@
Roo.extend(Roo.bootstrap.Navbar.Item, Roo.bootstrap.Component, {
];
cfg.cn[0].html = this.html || cfg.cn[0].html ;
-
- if (!this.href) {
+ if (this.menu) {
+ cfg.cn[0].tag='a';
+ cfg.cn[0].href='#';
+ }else if (!this.href) {
cfg.cn[0].tag='p';
cfg.cn[0].cls='navbar-text';
} else {