X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fbootstrap%2FLayoutMasonry.js;h=0b082f79d6dd8d03ea9986c83732140f167f9a44;hb=05d4479b42d7cf53ba7a700636903c81ff49d9a7;hp=f6e140d8492cf9b43977bb3a7520f71313c3498c;hpb=b39fe82add27604eb962af4ee4df17e0fdef35cd;p=roojs1 diff --git a/Roo/bootstrap/LayoutMasonry.js b/Roo/bootstrap/LayoutMasonry.js index f6e140d849..0b082f79d6 100644 --- a/Roo/bootstrap/LayoutMasonry.js +++ b/Roo/bootstrap/LayoutMasonry.js @@ -21,10 +21,13 @@ */ Roo.bootstrap.LayoutMasonry = function(config){ + Roo.bootstrap.LayoutMasonry.superclass.constructor.call(this, config); this.bricks = []; + Roo.bootstrap.LayoutMasonry.register(this); + this.addEvents({ // raw events /** @@ -100,10 +103,14 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component, { /** * @cfg {Number} alternativePadWidth padding below box.. */ - alternativePadWidth : 50, + alternativePadWidth : 50, + + selectedBrick : [], getAutoCreate : function(){ + var cfg = Roo.apply({}, Roo.bootstrap.LayoutMasonry.superclass.getAutoCreate.call(this)); + var cfg = { tag: this.tag, cls: 'blog-masonary-wrapper ' + this.cls, @@ -142,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); @@ -232,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; }, @@ -654,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); @@ -1227,16 +1239,35 @@ Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component, { }, + /** + * remove a Masonry Brick + * @param {Roo.bootstrap.MasonryBrick} the masonry brick to remove + */ + removeBrick : function(brick_id) + { + if (!brick_id) { + return; + } + + for (var i = 0; i