roojs-bootstrap.js

roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 3a6bc7b..f46d782 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -31440,12 +31440,12 @@ Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component,  {
      */   
     href : '',
     /**
-     * @cfg {String} (xs|sm|md|md-left|md-right|tall|wide) size
+     * @cfg {String} size (xs|sm|md|md-left|md-right|tall|wide)
      */   
     size : 'xs',
     
     /**
-     * @cfg {String} (center|bottom) placetitle
+     * @cfg {String} placetitle (center|bottom)
      */   
     placetitle : '',
     
@@ -31480,7 +31480,7 @@ Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component,  {
             cls += ' masonry-brick-image';
         }
         
-        if(!Roo.isTouch && this.maskInverse){
+        if(this.maskInverse){
             cls += ' mask-inverse';
         }
         

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index 25e8e27..048f652 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1320,23 +1320,23 @@ var G=E.indexOf(F);var H={x:this.currentSize.x+(this.padWidth/2)+((this.columnWi
 this.getContainerWidth();return A!==this.containerWidth;}});
 // Roo/bootstrap/MasonryBrick.js
 Roo.bootstrap.MasonryBrick=function(A){Roo.bootstrap.MasonryBrick.superclass.constructor.call(this,A);this.addEvents({"click":true});};Roo.extend(Roo.bootstrap.MasonryBrick,Roo.bootstrap.Component,{title:'',html:'',bgimage:'',videourl:'',cls:'',href:'',size:'xs',placetitle:'',isFitContainer:true,preventDefault:false,maskInverse:false,getAutoCreate:function(){if(!this.isFitContainer){return this.getSplitAutoCreate();
-}var A='masonry-brick masonry-brick-full';if(this.href.length){A+=' masonry-brick-link';}if(this.bgimage.length){A+=' masonry-brick-image';}if(!Roo.isTouch&&this.maskInverse){A+=' mask-inverse';}if(!this.html.length&&!this.maskInverse){A+=' enable-mask';}
-if(this.size){A+=' masonry-'+this.size+'-brick';}if(this.placetitle.length){switch(this.placetitle){case 'center':A+=' masonry-center-title';break;case 'bottom':A+=' masonry-bottom-title';break;default:break;}}else{if(!this.html.length&&!this.bgimage.length){A+=' masonry-center-title';
-}if(!this.html.length&&this.bgimage.length){A+=' masonry-bottom-title';}}if(this.cls){A+=' '+this.cls;}var B={tag:(this.href.length)?'a':'div',cls:A,cn:[{tag:'div',cls:'masonry-brick-paragraph',cn:[]}]};if(this.href.length){B.href=this.href;}var cn=B.cn[0].cn;
-if(this.title.length){cn.push({tag:'h4',cls:'masonry-brick-title',html:this.title});}if(this.html.length){cn.push({tag:'p',cls:'masonry-brick-text',html:this.html});}if(!this.title.length&&!this.html.length){B.cn[0].cls+=' hide';}if(this.bgimage.length){B.cn.push({tag:'img',cls:'masonry-brick-image-view',src:this.bgimage}
-);}if(this.videourl.length){var C=this.videourl.replace(/https:\/\/youtu\.be/,'https://www.youtube.com/embed/');B.cn.push({tag:'iframe',cls:'masonry-brick-image-view',src:C,frameborder:0,allowfullscreen:true});}B.cn.push({tag:'div',cls:'masonry-brick-mask'}
-);return B;},getSplitAutoCreate:function(){var A='masonry-brick masonry-brick-split';if(this.href.length){A+=' masonry-brick-link';}if(this.bgimage.length){A+=' masonry-brick-image';}if(this.size){A+=' masonry-'+this.size+'-brick';}switch(this.placetitle){case 'center':A+=' masonry-center-title';
-break;case 'bottom':A+=' masonry-bottom-title';break;default:if(!this.bgimage.length){A+=' masonry-center-title';}if(this.bgimage.length){A+=' masonry-bottom-title';}break;}if(this.cls){A+=' '+this.cls;}var B={tag:(this.href.length)?'a':'div',cls:A,cn:[{tag:'div',cls:'masonry-brick-split-head',cn:[{tag:'div',cls:'masonry-brick-paragraph',cn:[]}
-]},{tag:'div',cls:'masonry-brick-split-body',cn:[]}]};if(this.href.length){B.href=this.href;}if(this.title.length){B.cn[0].cn[0].cn.push({tag:'h4',cls:'masonry-brick-title',html:this.title});}if(this.html.length){B.cn[1].cn.push({tag:'p',cls:'masonry-brick-text',html:this.html}
-);}if(this.bgimage.length){B.cn[0].cn.push({tag:'img',cls:'masonry-brick-image-view',src:this.bgimage});}if(this.videourl.length){var C=this.videourl.replace(/https:\/\/youtu\.be/,'https://www.youtube.com/embed/');B.cn[0].cn.cn.push({tag:'iframe',cls:'masonry-brick-image-view',src:C,frameborder:0,allowfullscreen:true}
-);}return B;},initEvents:function(){switch(this.size){case 'xs':this.x=1;this.y=1;break;case 'sm':this.x=2;this.y=2;break;case 'md':case 'md-left':case 'md-right':this.x=3;this.y=3;break;case 'tall':this.x=2;this.y=3;break;case 'wide':this.x=3;this.y=2;break;
-case 'wide-thin':this.x=3;this.y=1;break;default:break;}if(Roo.isTouch){this.el.on('touchstart',this.onTouchStart,this);this.el.on('touchmove',this.onTouchMove,this);this.el.on('touchend',this.onTouchEnd,this);this.el.on('contextmenu',this.onContextMenu,this);
-}else{this.el.on('mouseenter',this.enter,this);this.el.on('mouseleave',this.leave,this);this.el.on('click',this.onClick,this);}if(typeof(this.parent().bricks)=='object'&&this.parent().bricks!=null){this.parent().bricks.push(this);}},onClick:function(e,el){var A=this.endTimer-this.startTimer;
-if(Roo.isTouch){if(A>1000){e.preventDefault();return;}}if(!this.preventDefault){return;}e.preventDefault();this.fireEvent('click',this);},enter:function(e,el){e.preventDefault();if(!this.isFitContainer||this.maskInverse){return;}if(this.bgimage.length&&this.html.length){this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0.9,true);
-}},leave:function(e,el){e.preventDefault();if(!this.isFitContainer||this.maskInverse){return;}if(this.bgimage.length&&this.html.length){this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0,true);}},onTouchStart:function(e,el){this.touchmoved=false;
-if(!this.isFitContainer){return;}if(!this.bgimage.length||!this.html.length){return;}this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0.9,true);this.timer=new Date().getTime();},onTouchMove:function(e,el){this.touchmoved=true;},onContextMenu:function(e,el){e.preventDefault();
-e.stopPropagation();return false;},onTouchEnd:function(e,el){if((new Date().getTime()-this.timer>1000)||!this.href.length||this.touchmoved){this.leave(e,el);return;}if(!this.bgimage.length||!this.html.length){if(this.href.length){window.location.href=this.href;
-}return;}if(!this.isFitContainer){return;}this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0,true);window.location.href=this.href;}});
+}var A='masonry-brick masonry-brick-full';if(this.href.length){A+=' masonry-brick-link';}if(this.bgimage.length){A+=' masonry-brick-image';}if(this.maskInverse){A+=' mask-inverse';}if(!this.html.length&&!this.maskInverse){A+=' enable-mask';}if(this.size){A+=' masonry-'+this.size+'-brick';
+}if(this.placetitle.length){switch(this.placetitle){case 'center':A+=' masonry-center-title';break;case 'bottom':A+=' masonry-bottom-title';break;default:break;}}else{if(!this.html.length&&!this.bgimage.length){A+=' masonry-center-title';}if(!this.html.length&&this.bgimage.length){A+=' masonry-bottom-title';
+}}if(this.cls){A+=' '+this.cls;}var B={tag:(this.href.length)?'a':'div',cls:A,cn:[{tag:'div',cls:'masonry-brick-paragraph',cn:[]}]};if(this.href.length){B.href=this.href;}var cn=B.cn[0].cn;if(this.title.length){cn.push({tag:'h4',cls:'masonry-brick-title',html:this.title}
+);}if(this.html.length){cn.push({tag:'p',cls:'masonry-brick-text',html:this.html});}if(!this.title.length&&!this.html.length){B.cn[0].cls+=' hide';}if(this.bgimage.length){B.cn.push({tag:'img',cls:'masonry-brick-image-view',src:this.bgimage});}if(this.videourl.length){var C=this.videourl.replace(/https:\/\/youtu\.be/,'https://www.youtube.com/embed/');
+B.cn.push({tag:'iframe',cls:'masonry-brick-image-view',src:C,frameborder:0,allowfullscreen:true});}B.cn.push({tag:'div',cls:'masonry-brick-mask'});return B;},getSplitAutoCreate:function(){var A='masonry-brick masonry-brick-split';if(this.href.length){A+=' masonry-brick-link';
+}if(this.bgimage.length){A+=' masonry-brick-image';}if(this.size){A+=' masonry-'+this.size+'-brick';}switch(this.placetitle){case 'center':A+=' masonry-center-title';break;case 'bottom':A+=' masonry-bottom-title';break;default:if(!this.bgimage.length){A+=' masonry-center-title';
+}if(this.bgimage.length){A+=' masonry-bottom-title';}break;}if(this.cls){A+=' '+this.cls;}var B={tag:(this.href.length)?'a':'div',cls:A,cn:[{tag:'div',cls:'masonry-brick-split-head',cn:[{tag:'div',cls:'masonry-brick-paragraph',cn:[]}]},{tag:'div',cls:'masonry-brick-split-body',cn:[]}
+]};if(this.href.length){B.href=this.href;}if(this.title.length){B.cn[0].cn[0].cn.push({tag:'h4',cls:'masonry-brick-title',html:this.title});}if(this.html.length){B.cn[1].cn.push({tag:'p',cls:'masonry-brick-text',html:this.html});}if(this.bgimage.length){B.cn[0].cn.push({tag:'img',cls:'masonry-brick-image-view',src:this.bgimage}
+);}if(this.videourl.length){var C=this.videourl.replace(/https:\/\/youtu\.be/,'https://www.youtube.com/embed/');B.cn[0].cn.cn.push({tag:'iframe',cls:'masonry-brick-image-view',src:C,frameborder:0,allowfullscreen:true});}return B;},initEvents:function(){switch(this.size){case 'xs':this.x=1;
+this.y=1;break;case 'sm':this.x=2;this.y=2;break;case 'md':case 'md-left':case 'md-right':this.x=3;this.y=3;break;case 'tall':this.x=2;this.y=3;break;case 'wide':this.x=3;this.y=2;break;case 'wide-thin':this.x=3;this.y=1;break;default:break;}if(Roo.isTouch){this.el.on('touchstart',this.onTouchStart,this);
+this.el.on('touchmove',this.onTouchMove,this);this.el.on('touchend',this.onTouchEnd,this);this.el.on('contextmenu',this.onContextMenu,this);}else{this.el.on('mouseenter',this.enter,this);this.el.on('mouseleave',this.leave,this);this.el.on('click',this.onClick,this);
+}if(typeof(this.parent().bricks)=='object'&&this.parent().bricks!=null){this.parent().bricks.push(this);}},onClick:function(e,el){var A=this.endTimer-this.startTimer;if(Roo.isTouch){if(A>1000){e.preventDefault();return;}}if(!this.preventDefault){return;}e.preventDefault();
+this.fireEvent('click',this);},enter:function(e,el){e.preventDefault();if(!this.isFitContainer||this.maskInverse){return;}if(this.bgimage.length&&this.html.length){this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0.9,true);}},leave:function(e,el){e.preventDefault();
+if(!this.isFitContainer||this.maskInverse){return;}if(this.bgimage.length&&this.html.length){this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0,true);}},onTouchStart:function(e,el){this.touchmoved=false;if(!this.isFitContainer){return;}if(!this.bgimage.length||!this.html.length){return;
+}this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0.9,true);this.timer=new Date().getTime();},onTouchMove:function(e,el){this.touchmoved=true;},onContextMenu:function(e,el){e.preventDefault();e.stopPropagation();return false;},onTouchEnd:function(e,el){if((new Date().getTime()-this.timer>1000)||!this.href.length||this.touchmoved){this.leave(e,el);
+return;}if(!this.bgimage.length||!this.html.length){if(this.href.length){window.location.href=this.href;}return;}if(!this.isFitContainer){return;}this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0,true);window.location.href=this.href;}});
+
 // Roo/bootstrap/Brick.js
 Roo.bootstrap.Brick=function(A){Roo.bootstrap.Brick.superclass.constructor.call(this,A);this.addEvents({"click":true});};Roo.extend(Roo.bootstrap.Brick,Roo.bootstrap.Component,{title:'',html:'',bgimage:'',cls:'',href:'',video:'',square:true,getAutoCreate:function(){var A='roo-brick';
 if(this.href.length){A+=' roo-brick-link';}if(this.bgimage.length){A+=' roo-brick-image';}if(!this.html.length&&!this.bgimage.length){A+=' roo-brick-center-title';}if(!this.html.length&&this.bgimage.length){A+=' roo-brick-bottom-title';}if(this.cls){A+=' '+this.cls;