fix enums

diff --git a/Roo/bootstrap/Button.js b/Roo/bootstrap/Button.js
index 7179f94..3636c15 100644 (file)
--- a/Roo/bootstrap/Button.js
+++ b/Roo/bootstrap/Button.js
@@ -119,9 +119,9 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
                     }
                 ]
             };
                     }
                 ]
             };

-            
-            if (['default', 'secondary' , 'primary', 'success', 'info', 'warning', 'danger', 'link'].indexOf(this.weight) > -1) {
-                cfg.cls += ' '+this.weight;
+            // why are we validating the weights?
+            if (Roo.bootstrap.Button.weights.indexOf(this.weight) > -1) {
+                cfg.cls +=  ' ' + this.weight;

             }
             
             return cfg;
             }
             
             return cfg;


@@ -144,7 +144,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
             //if (this.parentType != 'Navbar') {
             this.weight = this.weight.length ?  this.weight : 'default';
             //}
             //if (this.parentType != 'Navbar') {
             this.weight = this.weight.length ?  this.weight : 'default';
             //}

-            if (['default', 'primary', 'secondary', 'success', 'info', 'warning', 'danger', 'link'].indexOf(this.weight) > -1) {
+            if (Roo.bootstrap.Button.weights.indexOf(this.weight) > -1) {

                 
                 var outline = this.outline || this.weight == 'default' ? 'outline-' : '';
                 var weight = this.weight == 'default' ? 'secondary' : this.weight;
                 
                 var outline = this.outline || this.weight == 'default' ? 'outline-' : '';
                 var weight = this.weight == 'default' ? 'secondary' : this.weight;


@@ -159,7 +159,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
             cfg.tag = 'a';
             cfg.cls = 'btn-glow roo-button';
             
             cfg.tag = 'a';
             cfg.cls = 'btn-glow roo-button';
             

-            if (['default', 'primary', 'success', 'info', 'warning', 'danger', 'link'].indexOf(this.weight) > -1) {
+            if (Roo.bootstrap.Button.weights.indexOf(this.weight) > -1) {

                 
                 cfg.cls += ' ' + this.weight;
             }
                 
                 cfg.cls += ' ' + this.weight;
             }


@@ -403,7 +403,8 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
     
     setWeight : function(str)
     {
     
     setWeight : function(str)
     {

-       this.el.removeClass(Roo.bootstrap.Button.weightClass );
+       this.el.removeClass(Roo.bootstrap.Button.weights.map(function(w) { return 'btn-' + w; } ) );
+        this.el.removeClass(Roo.bootstrap.Button.weights.map(function(w) { return 'btn-outline-' + w; } ) );

         this.weight = str;
         var outline = this.outline ? 'outline-' : '';
         if (str == 'default') {
         this.weight = str;
         var outline = this.outline ? 'outline-' : '';
         if (str == 'default') {


@@ -415,18 +416,18 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
     
     
 });
     
     
 });

-// fixme - should include btn-outline-*
-Roo.bootstrap.Button.weightClass = [
-                        
-       "btn-default",
-       "btn-outline-secondary",
-       "btn-secondary",        
-       "btn-primary", 
-       "btn-success", 
-       "btn-info", 
-       "btn-warning",
-       "btn-danger",
-       "btn-link",
-       'btn-light',
-       'btn-dark'
+// fixme - this is probably generic bootstrap - should go in some kind of enum file.. - like sizes.
+
+Roo.bootstrap.Button.weights = [
+    'default',
+    'secondary' ,
+    'primary',
+    'success',
+    'info',
+    'warning',
+    'danger',
+    'link',
+    'light',
+    'dark',              
+   

 ];
\ No newline at end of file
 ];
\ No newline at end of file

diff --git a/docs/src/Roo_bootstrap_Button.js.html b/docs/src/Roo_bootstrap_Button.js.html
index 36ce09f..0ca37a4 100644 (file)
--- a/docs/src/Roo_bootstrap_Button.js.html
+++ b/docs/src/Roo_bootstrap_Button.js.html
@@ -415,6 +415,7 @@
 
 
 });
 
 
 });

+</span><span class="jsdoc-comment">// fixme - should include btn-outline-*

 </span><span class="jsdoc-var">Roo.bootstrap.Button.weightClass </span><span class="jsdoc-syntax">= [
 
        </span><span class="jsdoc-string">&quot;btn-default&quot;</span><span class="jsdoc-syntax">,
 </span><span class="jsdoc-var">Roo.bootstrap.Button.weightClass </span><span class="jsdoc-syntax">= [
 
        </span><span class="jsdoc-string">&quot;btn-default&quot;</span><span class="jsdoc-syntax">,

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 1fffa4c..3448660 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -1366,6 +1366,7 @@ Roo.extend(Roo.bootstrap.Button, Roo.bootstrap.Component,  {
     
     
 });
     
     
 });

+// fixme - should include btn-outline-*

 Roo.bootstrap.Button.weightClass = [
                         
        "btn-default",
 Roo.bootstrap.Button.weightClass = [
                         
        "btn-default",