X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-bootstrap-debug.js;h=f670fba5b400c3104ee4a7344a7894a173d165b5;hp=324d16011698a4493126b7323cc8c81dc5bb926b;hb=41a76ad00f5fc61e2452862ddf6908ae45d7fd73;hpb=405704c45feb8165614b274cf3797b4e1291dd45

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 324d160116..f670fba5b4 100644
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -1580,7 +1580,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
     title : '',
     subtitle : '',
     html : '',
-    
+    footer: '',
     
     childContainer : false,
 
@@ -1588,21 +1588,21 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
     {
         var cls = '';
         var t = this;
-        
+        Roo.log(this.margin_bottom.length);
         ['', 'top', 'bottom', 'left', 'right', 'x', 'y' ].forEach(function(v) {
             // in theory these can do margin_top : ml-xs-3 ??? but we don't support that yet
             
-            if (t['margin' + (v.length ? '_' : '') + v].length) {
+            if (('' + t['margin' + (v.length ? '_' : '') + v]).length) {
                 cls += ' m' +  (v.length ? v[0]  : '') + '-' +  t['margin' + (v.length ? '_' : '') + v];
             }
-            if (t['padding' + (v.length ? '_' : '') + v].length) {
+            if (('' + t['padding' + (v.length ? '_' : '') + v]).length) {
                 cls += ' p' +  (v.length ? v[0]  : '') + '-' +  t['padding' + (v.length ? '_' : '') + v];
             }
         });
         
         ['', 'xs', 'sm', 'lg', 'xl'].forEach(function(v) {
-            if (t['display' + (v.length ? '_' : '') + v].length) {
-                cls += ' d' +  (v.length ? '-' : '') + v + '-' + t['margin' + (v.length ? '_' : '') + v].length
+            if (('' + t['display' + (v.length ? '_' : '') + v]).length) {
+                cls += ' d' +  (v.length ? '-' : '') + v + '-' + t['margin' + (v.length ? '_' : '') + v]
             }
         });
         
@@ -1675,7 +1675,7 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
             cls : 'card-body',
             cn : []
         };
-        cfg.push(body);
+        cfg.cn.push(body);
         
         if (this.title.length) {
             body.cn.push({
@@ -1698,6 +1698,12 @@ Roo.extend(Roo.bootstrap.Card, Roo.bootstrap.Component,  {
             cls : 'roo-card-body-ctr'
         });
         
+        if (this.html.length) {
+            body.cn.push({
+                tag: 'div',
+                html : this.html
+            });
+        }
         // fixme ? handle objects?
         if (this.footer.length) {
             body.cn.push({