Roo/bootstrap/Button.js

[roojs1] / Roo / bootstrap / Button.js

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index fda7977..4fa7eb7 100644 (file)
--- a/Roo/bootstrap/Button.js
+++ b/Roo/bootstrap/Button.js
@@ -95,7 +95,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
         } else {
             cfg.tag = this.tag;
         }
-        cfg.html = this.html || cfg.html;
+        cfg.html = '<span class="roo-button-text">' + (this.html || cfg.html) + '</span>';
         
         if (this.toggle == true) {
             cfg={
@@ -292,22 +292,49 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
         
         this.fireEvent('click', this, e);
     },
+    
+    /**
+     * Enables this button
+     */
     enable : function()
     {
         this.disabled = false;
         this.el.removeClass('disabled');
     },
+    
+    /**
+     * Disable this button
+     */
     disable : function()
     {
         this.disabled = true;
         this.el.addClass('disabled');
     },
+     /**
+     * sets the active state on/off, 
+     * @param {Boolean} state (optional) Force a particular state
+     */
     setActive : function(v) {
         
-        this[v ? 'addClass' : 'removeClass']('active');
+        this.el[v ? 'addClass' : 'removeClass']('active');
+    },
+     /**
+     * toggles the current active state 
+     */
+    toggleActive : function()
+    {
+       var active = this.el.hasClass('active');
+       this.setActive(!active);
+       
         
+    },
+    setText : function(str)
+    {
         
     }
+    
+    
+    
 });
 
  
\ No newline at end of file