From e924e0d7d3e25b951d81b34d1aa401ec43761f7e Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Thu, 29 Nov 2018 12:16:11 +0800
Subject: [PATCH] Roo/bootstrap/Button.js

---
 Roo/bootstrap/Button.js | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index 7040231c92..82cc03c1a5 100644
--- 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 = {
-                            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;
-- 
2.39.2