projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
787a846
)
Roo/bootstrap/Button.js
author
Edward
<edward@roojs.com>
Mon, 31 Mar 2014 10:52:56 +0000
(18:52 +0800)
committer
Edward
<edward@roojs.com>
Mon, 31 Mar 2014 10:52:56 +0000
(18:52 +0800)
Roo/bootstrap/Button.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Button.js
b/Roo/bootstrap/Button.js
index
a2267f9
..
d78bde9
100644
(file)
--- a/
Roo/bootstrap/Button.js
+++ b/
Roo/bootstrap/Button.js
@@
-200,12
+200,17
@@
Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, {
cfg.href=this.href;
+ if(this.glyphicon){
+ cfg.cn = [
+ {
+ tag: 'span',
+ cls: 'glyphicon glyphicon-' + this.glyphicon,
+ html: this.html
+ }
+ ];
+ }
+
cfg.cn = [
- {
- tag: 'span',
- cls: 'glyphicon glyphicon-' + this.glyphicon
-
- },
{
tag: 'span',
cls: 'badge',
@@
-213,7
+218,7
@@
Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, {
}
];
-
//
cfg.html='';
+ cfg.html='';
}
if (cfg.tag !== 'a' && this.href !== '') {