Roo/bootstrap/Column.js

[roojs1] / Roo / bootstrap / Column.js

diff --git a/Roo/bootstrap/Column.js b/Roo/bootstrap/Column.js
index 40c258c..3e632a9 100644 (file)
--- a/Roo/bootstrap/Column.js
+++ b/Roo/bootstrap/Column.js
@@ -67,19 +67,21 @@ Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component,  {
         ['xs','sm','md','lg'].map(function(size){
             //Roo.log( size + ':' + settings[size]);
             
-            if (settings[size+'off'] 1== false) {
-                
+            if (settings[size+'off'] !== false) {
+                cfg.cls += ' col-' + size + '-offset-' + settings[size+'off'] ;
             }
             
             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-' + config[size] ) : '' // bs4 col-{num} replaces col-xs
+            );
             
         });
         
@@ -105,7 +107,7 @@ Roo.extend(Roo.bootstrap.Column, Roo.bootstrap.Component,  {
             
         }
         if (this.icon) {
-            cfg.html = '<i class="glyphicon glyphicon-'+this.icon + '"></i>' + + (cfg.html || '')
+            cfg.html = '<i class="glyphicon glyphicon-'+this.icon + '"></i>' +  (cfg.html || '');
         }
         
         return cfg;