roojs-bootstrap.js

roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index 56c66d1..af8ef3e 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -32752,7 +32752,7 @@ Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component,  {
             this.selectBrick();
         }
         
-        this.fireEvent('click', this);
+        this.fireEvent('click', this, e);
     },
     
     enter: function(e, el)

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index c96aedf..ad6e4af 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1371,7 +1371,7 @@ break;default:if(!this.bgimage.length){A+=' masonry-center-title';}if(this.bgima
 );}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();if(this.activeClass!=''){this.selectBrick();}this.fireEvent('click',this);},enter:function(e,el){e.preventDefault();if(!this.isFitContainer||this.maskInverse||this.videourl.length){return;
+if(Roo.isTouch){if(A>1000){e.preventDefault();return;}}if(!this.preventDefault){return;}e.preventDefault();if(this.activeClass!=''){this.selectBrick();}this.fireEvent('click',this,e);},enter:function(e,el){e.preventDefault();if(!this.isFitContainer||this.maskInverse||this.videourl.length){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||this.videourl.length){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;