projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8479e9e
)
Roo/bootstrap/Button.js
author
Alan Knowles
<alan@roojs.com>
Thu, 29 Nov 2018 02:15:58 +0000
(10:15 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 29 Nov 2018 02:15:58 +0000
(10:15 +0800)
Roo/bootstrap/Button.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Button.js
b/Roo/bootstrap/Button.js
index
2ea691f
..
6c0fa0d
100644
(file)
--- a/
Roo/bootstrap/Button.js
+++ b/
Roo/bootstrap/Button.js
@@
-150,7
+150,12
@@
Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, {
if (['default', 'primary', 'secondary', 'success', 'info', 'warning', 'danger', 'link'].indexOf(this.weight) > -1) {
var outline = this.outline || this.weight == 'default' ? 'outline-' : '';
if (['default', 'primary', 'secondary', 'success', 'info', 'warning', 'danger', 'link'].indexOf(this.weight) > -1) {
var outline = this.outline || this.weight == 'default' ? 'outline-' : '';
- cfg.cls += ' btn-' + outline + this.weight;
+ var weight = this.weight == 'default' ? 'secondary' : this.weight;
+ cfg.cls += ' btn-' + outline + weight;
+ if (this.weight == 'default') {
+ // BC
+ cfg.cls += ' btn-' + this.weight;
+ }
}
} else if (this.theme==='glow') {
}
} else if (this.theme==='glow') {