projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/bootstrap/LayoutMasonry.js
[roojs1]
/
Roo
/
bootstrap
/
LayoutMasonry.js
diff --git
a/Roo/bootstrap/LayoutMasonry.js
b/Roo/bootstrap/LayoutMasonry.js
index
895a77d
..
0b082f7
100644
(file)
--- a/
Roo/bootstrap/LayoutMasonry.js
+++ b/
Roo/bootstrap/LayoutMasonry.js
@@
-249,22
+249,14
@@
Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component, {
{
this.getContainerWidth();
{
this.getContainerWidth();
- Roo.log('this.containerWidth : ' + this.containerWidth);
-
var boxWidth = this.boxWidth;
var boxWidth = this.boxWidth;
- Roo.log('this.boxWidth : ' + this.boxWidth);
-
if(this.containerWidth < boxWidth){
boxWidth = this.containerWidth;
}
if(this.containerWidth < boxWidth){
boxWidth = this.containerWidth;
}
- Roo.log('boxWidth : ' + boxWidth);
-
this.unitWidth = Math.floor((boxWidth - (this.gutter * 2)) / 3);
this.unitWidth = Math.floor((boxWidth - (this.gutter * 2)) / 3);
- Roo.log('this.unitWidth : ' + this.unitWidth);
-
this.el.setHeight(boxWidth);
},
this.el.setHeight(boxWidth);
},
@@
-671,8
+663,11
@@
Roo.extend(Roo.bootstrap.LayoutMasonry, Roo.bootstrap.Component, {
b.el.setWidth(width);
b.el.setHeight(height);
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?
// iframe?
- b.el.select('iframe',true).setSize(width,height);
+
//
b.el.select('iframe',true).setSize(width,height);
}, this);
}, this);
@@
-1257,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);
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();
}
this.el.dom.removeChild(Roo.get(brick_id).dom);
this.initial();
}
@@
-1273,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;
var cn = new Roo.bootstrap.MasonryBrick(cfg);
//this.register(cn);
cn.parentId = this.id;
- cn.
onRender(this.el, nul
l);
+ cn.
render(this.e
l);
return cn;
},
return cn;
},