From 98486149c7957d8ced7196dea40353032029ef18 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 11 Feb 2021 12:47:10 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Popover.js --- Roo/bootstrap/Popover.js | 2 +- roojs-bootstrap-debug.js | 2 +- roojs-bootstrap.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Roo/bootstrap/Popover.js b/Roo/bootstrap/Popover.js index 572a3eaa85..4ec1683001 100644 --- a/Roo/bootstrap/Popover.js +++ b/Roo/bootstrap/Popover.js @@ -376,7 +376,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { //normal display... or moved up/down. this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('tl', false); - xy[0]-=12;xy[1]+=5; // << fix me + xy[0]-=10;xy[1]+=5; // << fix me this.arrowEl.setXY(xy); return true; } diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index d6b7fba26e..26939e6b9a 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -19972,7 +19972,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { //normal display... or moved up/down. this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('tl', false); - xy[0]+=2;xy[1]+=5; // << fix me + xy[0]-=12;xy[1]+=5; // << fix me this.arrowEl.setXY(xy); return true; } diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index f32ef16f10..04f9752c98 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -825,7 +825,7 @@ this.hoverState='in';if(this.modal){this.maskEl.setSize(Roo.lib.Dom.getViewWidth this.fireEvent('show',this);},updatePosition:function(A,B){A=A?A:this.placement;B=typeof(B)=='undefined'?true:B;this.el.removeClass(['fade','top','bottom','left','right','in','bs-popover-top','bs-popover-bottom','bs-popover-left','bs-popover-right']);this.el.addClass(A+' bs-popover-'+A); if(!this.alignEl){return false;}switch(A){case 'right':var C=this.el.getAlignToXY(this.alignEl,'tl-tr',[10,0]);var D=this.el.getAlignToXY(this.alignEl,'tl-tr?',[10,0]);if(!B||C.equals(D)||C[0]==D[0]){this.el.setXY(D);var xy=this.alignEl.getAnchorXY('tr',false); 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); +xy[0]-=12;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[1]+=2;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']} -- 2.39.2