X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2FLayoutMasonry.js;h=0b082f79d6dd8d03ea9986c83732140f167f9a44;hb=05d4479b42d7cf53ba7a700636903c81ff49d9a7;hp=fe6c6984285d7f467764d62487b35296670b952c;hpb=aa96998cbcba93451523aeda0bfcd26b982a82eb;p=roojs1 diff --git a/Roo/bootstrap/LayoutMasonry.js b/Roo/bootstrap/LayoutMasonry.js index fe6c698428..0b082f79d6 100644 --- a/Roo/bootstrap/LayoutMasonry.js +++ b/Roo/bootstrap/LayoutMasonry.js @@ -249,30 +249,20 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component, { { this.getContainerWidth(); - Roo.log('this.containerWidth : ' + this.containerWidth); - var boxWidth = this.boxWidth; - Roo.log('this.boxWidth : ' + this.boxWidth); - if(this.containerWidth < boxWidth){ boxWidth = this.containerWidth; } - Roo.log('boxWidth : ' + boxWidth); - this.unitWidth = Math.floor((boxWidth - (this.gutter * 2)) / 3); - Roo.log('this.unitWidth : ' + this.unitWidth); - this.el.setHeight(boxWidth); }, getContainerWidth : function() { - Roo.log(this.el); - Roo.log(this.el.getBox(true)); this.containerWidth = this.el.getBox(true).width; //maybe use getComputedWidth }, @@ -673,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); @@ -1259,7 +1252,6 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component, { for (var i = 0; i