From 268c608a966f13960ad1f3466fb3cd11293add99 Mon Sep 17 00:00:00 2001
From: Edward <edward@roojs.com>
Date: Thu, 17 Apr 2014 12:25:55 +0800
Subject: [PATCH] Roo/bootstrap/Button.js

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

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index 35327b05f4..bec1d57027 100644
--- a/Roo/bootstrap/Button.js
+++ b/Roo/bootstrap/Button.js
@@ -170,6 +170,10 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
             
             delete cfg.html;
             
+        } 
+        else if (this.menu) {
+            cfg.cls += ' dropdown';
+            cfg.html = this.html  + ' <span class="caret"></span>';
         }
         
         if (this.disabled) {
@@ -225,11 +229,6 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
             cfg.html='';
         }
         
-        if (this.menu) {
-            cfg.cls += ' dropdown';
-            cfg.html = cfg.html  + ' <span class="caret"></span>';
-        }
-        
         if (cfg.tag !== 'a' && this.href !== '') {
             throw "Tag must be a to set href.";
         } else if (this.href.length > 0) {
-- 
2.39.2