projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Roo/bootstrap/Button.js
[roojs1]
/
Roo
/
bootstrap
/
Button.js
diff --git
a/Roo/bootstrap/Button.js
b/Roo/bootstrap/Button.js
index
d78bde9
..
5bbb76c
100644
(file)
--- a/
Roo/bootstrap/Button.js
+++ b/
Roo/bootstrap/Button.js
@@
-200,6
+200,8
@@
Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, {
cfg.href=this.href;
+ var value = cfg.html;
+
if(this.glyphicon){
cfg.cn = [
{
@@
-211,6
+213,7
@@
Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, {
}
cfg.cn = [
+ cfg.html,
{
tag: 'span',
cls: 'badge',