projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a8996f1
)
Roo/bootstrap/Button.js
author
Julian Knowles
<julian@roojs.com>
Fri, 24 Jan 2014 10:24:06 +0000
(18:24 +0800)
committer
Julian Knowles
<julian@roojs.com>
Fri, 24 Jan 2014 10:24:06 +0000
(18:24 +0800)
Roo/bootstrap/Button.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Button.js
b/Roo/bootstrap/Button.js
index
d586d87
..
0ec831f
100644
(file)
--- a/
Roo/bootstrap/Button.js
+++ b/
Roo/bootstrap/Button.js
@@
-61,7
+61,7
@@
Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, {
}
- if (this.parent().btn) {
+ if (this.parent().btn
&&this.parent().type='ButtonGroup'
) {
cfg.cls='btn';
if (this.parentType != 'Navbar') {
this.weight = this.weight.length ? this.weight : 'default';