allow string based values for comboboxarray

[roojs1] / Roo / bootstrap / Column.js

diff --git a/Roo/bootstrap/Column.js b/Roo/bootstrap/Column.js
index 776828d..504d61d 100644 (file)
--- a/Roo/bootstrap/Column.js
+++ b/Roo/bootstrap/Column.js
@@ -57,13 +57,10 @@ Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component,  {
     
     getAutoCreate : function(){
         var cfg = Roo.apply({}, Roo.bootstrap.Column.superclass.getAutoCreate.call(this));
-        Roo.log('column html');
         
-        Roo.log(this.html);
         cfg = {
             tag: 'div',
-            cls: 'column',
-            html : this.html || ''
+            cls: 'column'
         };
         
         var settings=this;
@@ -77,12 +74,14 @@ Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component,  {
             if (settings[size] === false) {
                 return;
             }
-            Roo.log(settings[size]);
+            
             if (!settings[size]) { // 0 = hidden
-                cfg.cls += ' hidden-' + size;
+                cfg.cls += ' hidden-' + size + ' hidden' + size + '-down';;
                 return;
             }
-            cfg.cls += ' col-' + size + '-' + settings[size];
+            cfg.cls += ' col-' + size + '-' + settings[size] + (
+                size == 'xs' ? (' col-' + settings[size] ) : '' // bs4 col-{num} replaces col-xs
+            );
             
         });
         
@@ -95,10 +94,9 @@ Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component,  {
         }
         
         
-//        if (this.html.length) {
-//            cfg.html = this.html;
-//        }
-        
+        if (this.html.length) {
+            cfg.html = this.html;
+        }
         if (this.fa) {
             var fasize = '';
             if (this.fasize > 1) {