Roo/bootstrap/Button.js

[roojs1] / Roo / bootstrap / Button.js

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index 3515280..c20df0d 100644 (file)
--- a/Roo/bootstrap/Button.js
+++ b/Roo/bootstrap/Button.js
@@ -79,7 +79,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
     
     
     pressed : null,
-    
+     
     
     getAutoCreate : function(){
         
@@ -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={
@@ -270,7 +270,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
             this.el.select('.roo-button').on('click', this.onClick, this);
        }
        
-       
+       this.el.enableDisplayMode();
         
     },
     onClick : function(e)
@@ -292,11 +292,19 @@ 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;
@@ -309,12 +317,9 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
     setActive : function(v) {
         
         this.el[v ? 'addClass' : 'removeClass']('active');
-        
-        
     },
      /**
-     * If a state it passed, it becomes the pressed state otherwise the current state is toggled.
-     * @param {Boolean} state (optional) Force a particular state
+     * toggles the current active state 
      */
     toggleActive : function()
     {
@@ -322,10 +327,22 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
        this.setActive(!active);
        
         
+    },
+    setText : function(str)
+    {
+        this.el.select('.roo-button-text',true).first().dom.innerHTML = str;
+    },
+    hide: function() {
+       
+     
+        this.el.hide();   
+    },
+    show: function() {
+       
+        this.el.show();   
     }
     
     
-    
 });
 
  
\ No newline at end of file