projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f988392
)
Roo/bootstrap/NavItem.js
author
Alan Knowles
<alan@roojs.com>
Mon, 25 Aug 2014 06:43:46 +0000
(14:43 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 25 Aug 2014 06:43:46 +0000
(14:43 +0800)
Roo/bootstrap/NavItem.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/NavItem.js
b/Roo/bootstrap/NavItem.js
index
c2275ab
..
146c084
100644
(file)
--- a/
Roo/bootstrap/NavItem.js
+++ b/
Roo/bootstrap/NavItem.js
@@
-85,21
+85,13
@@
Roo.extend(Roo.bootstrap.NavItem, Roo.bootstrap.Component, {
if (this.menu) {
-
- cfg.cn[0].href='#';
+
cfg.cn[0].html += " <span class='caret'></span>";
- //}else if (!this.href) {
- // cfg.cn[0].tag='p';
- // cfg.cn[0].cls='navbar-text';
- } else {
- cfg.cn[0].tag='a';
- cfg.cn[0].href=this.href||'#';
- cfg.cn[0].html=this.html;
+
}
if (this.badge !== '') {
-
-
+
cfg.cn[0].html += ' <span class="badge">' + this.badge + '</span>';
}