allow string based values for comboboxarray

[roojs1] / Roo / bootstrap / Brick.js

diff --git a/Roo/bootstrap/Brick.js b/Roo/bootstrap/Brick.js
index f597451..425b22b 100644 (file)
--- a/Roo/bootstrap/Brick.js
+++ b/Roo/bootstrap/Brick.js
@@ -139,25 +139,36 @@ Roo.extend(Roo.bootstrap.Brick, Roo.bootstrap.Component,  {
             this.el.on('mouseleave', this.leave, this);
         }
         
-        
         Roo.EventManager.onWindowResize(this.resize, this); 
         
-        (function() {
-            this.resize();
-        }).defer(100);
+        if(this.bgimage.length){
+            this.imageEl = this.el.select('.roo-brick-image-view', true).first();
+            this.imageEl.on('load', this.onImageLoad, this);
+            return;
+        }
+        
+        this.resize();
+    },
+    
+    onImageLoad : function()
+    {
+        this.resize();
     },
     
     resize : function()
     {
         var paragraph = this.el.select('.roo-brick-paragraph', true).first();
         
-        paragraph.setWidth(paragraph.getWidth() + paragraph.getPadding('lr'));
         paragraph.setHeight(paragraph.getWidth() + paragraph.getPadding('tb'));
         
         if(this.bgimage.length){
             var image = this.el.select('.roo-brick-image-view', true).first();
+            
             image.setWidth(paragraph.getWidth());
-//            image.setHeight(paragraph.getWidth());
+            
+            if(this.square){
+                image.setHeight(paragraph.getWidth());
+            }
             
             this.el.setHeight(image.getHeight());
             paragraph.setHeight(image.getHeight());