X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2FLayoutMasonry.js;h=0b082f79d6dd8d03ea9986c83732140f167f9a44;hb=05d4479b42d7cf53ba7a700636903c81ff49d9a7;hp=c19295158ac3b5c7a3aab082a2590280d1bf0a10;hpb=eb80f72c3b83058f94d6ae5124077f9d5b5adcce;p=roojs1 diff --git a/Roo/bootstrap/LayoutMasonry.js b/Roo/bootstrap/LayoutMasonry.js index c19295158a..0b082f79d6 100644 --- 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); @@ -239,7 +241,7 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component, { this.colWidth = boxWidth + avail - this.padWidth; - 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).first().set('width', width); + b.el.select('iframe',true).first().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