projects
/
roojs1
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
07bcd0e
)
Roo/bootstrap/Button.js
author
Alan Knowles
<alan@roojs.com>
Thu, 29 Nov 2018 04:16:11 +0000
(12:16 +0800)
committer
Alan Knowles
<alan@roojs.com>
Thu, 29 Nov 2018 04:16:11 +0000
(12:16 +0800)
Roo/bootstrap/Button.js
patch
|
blob
|
history
diff --git
a/Roo/bootstrap/Button.js
b/Roo/bootstrap/Button.js
index
7040231
..
82cc03c
100644
(file)
--- a/
Roo/bootstrap/Button.js
+++ b/
Roo/bootstrap/Button.js
@@
-255,12
+255,19
@@
Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component, {
if(this.glyphicon){
value = {
if(this.glyphicon){
value = {
- tag: 'span',
- cls: 'glyphicon glyphicon-' + this.glyphicon,
- html: this.html
- };
-
+ tag: 'span',
+ cls: 'glyphicon glyphicon-' + this.glyphicon,
+ html: this.html
+ };
}
}
+ if(this.glyphicon){
+ value = {
+ tag: 'i',
+ cls: 'fa fas fa-' + this.fa,
+ html: this.html
+ };
+ }
+
var bw = this.badge_weight.length ? this.badge_weight :
(this.weight.length ? this.weight : 'secondary');
bw = bw == 'default' ? 'secondary' : bw;
var bw = this.badge_weight.length ? this.badge_weight :
(this.weight.length ? this.weight : 'secondary');
bw = bw == 'default' ? 'secondary' : bw;