Roo/bootstrap/MasonryBrick.js

roojs-bootstrap.js
roojs-bootstrap-debug.js

diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js
index a0fcf49..173d821 100644 (file)
--- a/roojs-bootstrap-debug.js
+++ b/roojs-bootstrap-debug.js
@@ -30334,7 +30334,7 @@ Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component,  {
             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.onContext, this);
+            this.el.on('contextmenu', this.onContextMenu, this);
         } else {
             this.el.on('mouseenter'  ,this.enter, this);
             this.el.on('mouseleave', this.leave, this);
@@ -30348,7 +30348,7 @@ Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component,  {
     
     onClick: function(e, el)
     {
-        alert('click');
+       // alert('click');
         
         if(!Roo.isTouch){
             return;
@@ -30356,7 +30356,7 @@ Roo.extend(Roo.bootstrap.MasonryBrick, Roo.bootstrap.Component,  {
         
         var time = this.endTimer - this.startTimer;
         
-        alert(time);
+        //alert(time);
         
         if(time < 1000){
             return;

diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js
index f1e3370..92b8187 100644 (file)
--- a/roojs-bootstrap.js
+++ b/roojs-bootstrap.js
@@ -1268,12 +1268,12 @@ if(this.href.length){A+=' masonry-brick-link';}if(this.bgimage.length){A+=' maso
 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.bgimage.length){B.cn.push({tag:'img',cls:'masonry-brick-image-view',src:this.bgimage}
 );}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.onContext,this);
-}else{this.el.on('mouseenter',this.enter,this);this.el.on('mouseleave',this.leave,this);}if(typeof(this.parent().bricks)=='object'&&this.parent().bricks!=null){this.parent().bricks.push(this);}},onClick:function(e,el){alert('click');if(!Roo.isTouch){return;
-}var A=this.endTimer-this.startTimer;alert(A);if(A<1000){return;}e.preventDefault();},enter:function(e,el){e.preventDefault();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.bgimage.length&&this.html.length){this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0,true);}},onTouchStart:function(e,el){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();this.touchmoved=false;},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;}this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0,true);window.location.href=this.href;}});
+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);}if(typeof(this.parent().bricks)=='object'&&this.parent().bricks!=null){this.parent().bricks.push(this);}},onClick:function(e,el){if(!Roo.isTouch){return;}var A=this.endTimer-this.startTimer;
+if(A<1000){return;}e.preventDefault();},enter:function(e,el){e.preventDefault();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.bgimage.length&&this.html.length){this.el.select('.masonry-brick-paragraph',true).first().setOpacity(0,true);
+}},onTouchStart:function(e,el){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();this.touchmoved=false;},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;}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;