projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/bootstrap/MasonryBrick.js
[roojs1]
/
Roo
/
bootstrap
/
MasonryBrick.js
diff --git
a/Roo/bootstrap/MasonryBrick.js
b/Roo/bootstrap/MasonryBrick.js
index
edebac8
..
477bfef
100644
(file)
--- a/
Roo/bootstrap/MasonryBrick.js
+++ b/
Roo/bootstrap/MasonryBrick.js
@@
-90,7
+90,7
@@
Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component, {
return this.getSplitAutoCreate();
}
return this.getSplitAutoCreate();
}
- var cls = 'masonry-brick masonry-brick-full';
+ var cls = 'masonry-brick masonry-brick-full
embed-responsive
';
if(this.href.length){
cls += ' masonry-brick-link';
if(this.href.length){
cls += ' masonry-brick-link';
@@
-104,7
+104,7
@@
Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component, {
cls += ' mask-inverse';
}
cls += ' mask-inverse';
}
- if(!this.html.length && !this.maskInverse){
+ if(!this.html.length && !this.maskInverse
&& !this.videourl.length
){
cls += ' enable-mask';
}
cls += ' enable-mask';
}
@@
-175,7
+175,8
@@
Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component, {
cls: 'masonry-brick-text',
html: this.html
});
cls: 'masonry-brick-text',
html: this.html
});
- }
+ }
+
if (!this.title.length && !this.html.length) {
cfg.cn[1].cls += ' hide';
}
if (!this.title.length && !this.html.length) {
cfg.cn[1].cls += ' hide';
}
@@
-193,12
+194,11
@@
Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component, {
// youtube support only?
cfg.cn.push({
tag: 'iframe',
// youtube support only?
cfg.cn.push({
tag: 'iframe',
- cls: 'masonry-brick-image-view',
+ cls: 'masonry-brick-image-view
embed-responsive-item
',
src: vurl,
frameborder : 0,
allowfullscreen : true
});
src: vurl,
frameborder : 0,
allowfullscreen : true
});
-
}
return cfg;
}
return cfg;
@@
-377,11
+377,11
@@
Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component, {
e.preventDefault();
e.preventDefault();
- if (this.activ
c
Class != '') {
+ if (this.activ
e
Class != '') {
this.selectBrick();
}
this.selectBrick();
}
- this.fireEvent('click', this);
+ this.fireEvent('click', this
, e
);
},
enter: function(e, el)
},
enter: function(e, el)
@@
-497,8
+497,12
@@
Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component, {
m.selectedBrick.push(this.id);
this.el.addClass(this.activeClass);
return;
m.selectedBrick.push(this.id);
this.el.addClass(this.activeClass);
return;
- }
+ }
,
+ isSelected : function(){
+ return this.el.hasClass(this.activeClass);
+
+ }
});
Roo.apply(Roo.bootstrap.MasonryBrick, {
});
Roo.apply(Roo.bootstrap.MasonryBrick, {