Roo/bootstrap/Button.js

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index bec1d57..981ea7e 100644 (file)
--- a/Roo/bootstrap/Button.js
+++ b/Roo/bootstrap/Button.js
@@ -150,6 +150,10 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
             cfg.cls += ' active';
         }
         
+        if (this.disabled) {
+            cfg.disabled = 'disabled';
+        }
+        
         cfg.cls += this.size.length ? (' btn-' + this.size) : '';
          
         //gsRoo.log(this.parentType);
@@ -176,16 +180,6 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
             cfg.html = this.html  + ' <span class="caret"></span>';
         }
         
-        if (this.disabled) {
-            cfg.disabled = 'disabled';
-        }
-        //????
-        if (this.items) {
-            Roo.log('changing to ul' );
-            cfg.tag = 'ul';
-            this.glyphicon = 'caret';
-        }
-        
         if (this.glyphicon) {
             cfg.html = ' ' + cfg.html;