Roo/bootstrap/LayoutMasonry.js

[roojs1] / Roo / bootstrap / LayoutMasonry.js

diff --git a/Roo/bootstrap/LayoutMasonry.js b/Roo/bootstrap/LayoutMasonry.js
index bb78507..45c0a24 100644 (file)
--- a/Roo/bootstrap/LayoutMasonry.js
+++ b/Roo/bootstrap/LayoutMasonry.js
@@ -149,6 +149,8 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component,  {
     
     initial : function()
     {
+        this.selectedBrick = [];
+        
         this.currentSize = this.el.getBox(true);
         
         Roo.EventManager.onWindowResize(this.resize, this); 
@@ -226,20 +228,20 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component,  {
         }
         
         var containerWidth = this.containerWidth;
-        Roo.log(containerWidth);
+        
         var cols = Math.floor(containerWidth / boxWidth);
-        Roo.log(cols);
+        
         this.cols = Math.max( cols, 1 );
         
         this.cols = this.maxCols > 0 ? Math.min( this.cols, this.maxCols ) : this.cols;
         
         var totalBoxWidth = this.cols * boxWidth - this.padWidth;
-        Roo.log(totalBoxWidth);
-        var avail = (containerWidth - totalBoxWidth) / this.cols;
-        Roo.log(avail);
+        
+        var avail = Math.floor((containerWidth - totalBoxWidth) / this.cols);
+        
         this.colWidth = boxWidth + avail - this.padWidth;
-        Roo.log(this.colWidth);
-        this.unitWidth = Math.floor((this.colWidth - (this.gutter * 2)) / 3);
+        
+        this.unitWidth = Math.round((this.colWidth - (this.gutter * 2)) / 3);
         this.unitHeight = this.boxHeight > 0 ? this.boxHeight  : this.unitWidth;
     },
     
@@ -661,8 +663,11 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component,  {
                 
                 b.el.setWidth(width);
                 b.el.setHeight(height);
+                
+                b.el.select('iframe',true).set('width', width);
+                b.el.select('iframe',true).set(height)
                 // iframe?
-                b.el.select('iframe',true).setSize(width,height);
+//                b.el.select('iframe',true).setSize(width,height);
                 
             }, this);
             
@@ -1247,7 +1252,6 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component,  {
         for (var i = 0; i<this.bricks.length; i++) {
             if (this.bricks[i].id == brick_id) {
                 this.bricks.splice(i,1);
-                this.selectedBrick=[];
                 this.el.dom.removeChild(Roo.get(brick_id).dom);
                 this.initial();
             }
@@ -1263,7 +1267,7 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component,  {
         var cn = new Roo.bootstrap.MasonryBrick(cfg);
         //this.register(cn);
         cn.parentId = this.id;
-        cn.onRender(this.el, null);
+        cn.render(this.el);
         return cn;
     },