projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d6a2aa6
)
Roo/bootstrap/Navbar.Item.js
author
Julian Knowles
<julian@roojs.com>
Wed, 22 Jan 2014 10:40:34 +0000
(18:40 +0800)
committer
Julian Knowles
<julian@roojs.com>
Wed, 22 Jan 2014 10:40:34 +0000
(18:40 +0800)
Roo/bootstrap/Navbar.Item.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Navbar.Item.js
b/Roo/bootstrap/Navbar.Item.js
index
4aedd6f
..
869a166
100644
(file)
--- a/
Roo/bootstrap/Navbar.Item.js
+++ b/
Roo/bootstrap/Navbar.Item.js
@@
-40,7
+40,7
@@
Roo.extend(Roo.bootstrap.Navbar.Item, Roo.bootstrap.Component, {
}
if (this.glyphicon) {
- cfg.cn[0].html = '<i class="glyphicon glyphicon-'+this.glyphicon+'"></i><span>'
+
cfg.cn[0].html || this.html + '</span>'
+ cfg.cn[0].html = '<i class="glyphicon glyphicon-'+this.glyphicon+'"></i><span>'
+
cfg.cn[0].html || this.html + '</span>'
}
return cfg;