From: Alan Knowles Date: Thu, 11 Feb 2021 04:38:14 +0000 (+0800) Subject: roojs-bootstrap.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=a1c13160b4f99504c25bdb36a1937892ef271f5a roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Popover.js --- diff --git a/Roo/bootstrap/Popover.js b/Roo/bootstrap/Popover.js index 8fb5105be1..83e6ee8dd7 100644 --- a/Roo/bootstrap/Popover.js +++ b/Roo/bootstrap/Popover.js @@ -404,7 +404,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { //normal display... or moved up/down. this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('b', false); - xy[1]+=5; // << fix me + xy[1]+=2; // << fix me this.arrowEl.setXY(xy); return true; } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index a8d4eae744..a3ad1380f8 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -20000,7 +20000,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { //normal display... or moved up/down. this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('b', false); - xy[0]+=2;xy[1]+=5; // << fix me + xy[1]+=5; // << fix me this.arrowEl.setXY(xy); return true; } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index fd7b3929c7..13f29fc740 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -827,7 +827,7 @@ if(!this.alignEl){return false;}switch(A){case 'right':var C=this.el.getAlignToX xy[0]+=2;xy[1]+=5;this.arrowEl.setXY(xy);return true;}B=false;case 'left':var C=this.el.getAlignToXY(this.alignEl,'tr-tl',[-10,0]);var D=this.el.getAlignToXY(this.alignEl,'tr-tl?',[-10,0]);if(!B||C.equals(D)||C[0]==D[0]){this.el.setXY(D);var xy=this.alignEl.getAnchorXY('tl',false); xy[0]+=2;xy[1]+=5;this.arrowEl.setXY(xy);return true;}return this.updatePosition('right',false);case 'top':var C=this.el.getAlignToXY(this.alignEl,'b-t',[0,-10]);var D=this.el.getAlignToXY(this.alignEl,'b-t?',[0,-10]);if(!B||C.equals(D)||C[1]==D[1]){this.el.setXY(D); var xy=this.alignEl.getAnchorXY('t',false);xy[1]-=10;this.arrowEl.setXY(xy);return true;}B=false;case 'bottom':var C=this.el.getAlignToXY(this.alignEl,'t-b',[0,10]);var D=this.el.getAlignToXY(this.alignEl,'t-b?',[0,10]);if(!B||C.equals(D)||C[1]==D[1]){this.el.setXY(D); -var xy=this.alignEl.getAnchorXY('b',false);xy[0]+=2;xy[1]+=5;this.arrowEl.setXY(xy);return true;}return this.updatePosition('top',false);}return false;},hide:function(){this.el.setXY([0,0]);this.el.removeClass('in');this.el.hide();this.hoverState=null;this.maskEl.hide(); +var xy=this.alignEl.getAnchorXY('b',false);xy[1]+=5;this.arrowEl.setXY(xy);return true;}return this.updatePosition('top',false);}return false;},hide:function(){this.el.setXY([0,0]);this.el.removeClass('in');this.el.hide();this.hoverState=null;this.maskEl.hide(); this.fireEvent('hide',this);}});Roo.apply(Roo.bootstrap.Popover,{alignment:{'left':['r-l',[-10,0],'left bs-popover-left'],'right':['l-br',[10,0],'right bs-popover-right'],'bottom':['t-b',[0,10],'top bs-popover-top'],'top':['b-t',[0,-10],'bottom bs-popover-bottom']} ,zIndex:20001,clickHander:false,onMouseDown:function(e){if(!e.getTarget(".roo-popover")){this.hideAll();}},popups:[],register:function(A){if(!Roo.bootstrap.Popover.clickHandler){Roo.bootstrap.Popover.clickHandler=Roo.get(document).on("mousedown",Roo.bootstrap.Popover.onMouseDown,Roo.bootstrap.Popover); }this.hideAll();this.popups.push(A);},hideAll:function(){this.popups.forEach(function(p){p.hide();});}});