From: Edward <edward@roojs.com>
Date: Mon, 31 Mar 2014 10:52:56 +0000 (+0800)
Subject: Roo/bootstrap/Button.js
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=b47b9c15fc689837ae134ed4d7d368a25f7d3205;p=roojs1

Roo/bootstrap/Button.js
---

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index a2267f9942..d78bde9228 100644
--- 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 !== '') {