Roo/bootstrap/Button.js

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index 35327b0..bec1d57 100644 (file)
--- 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) {