From: Alan Knowles Date: Thu, 11 Feb 2021 04:02:49 +0000 (+0800) Subject: Roo/bootstrap/Popover.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=bb81b2669f5e2e6ba0f9e6550a1591dbe50f487e Roo/bootstrap/Popover.js --- diff --git a/Roo/bootstrap/Popover.js b/Roo/bootstrap/Popover.js index c96988a739..3be5e4c5e8 100644 --- a/Roo/bootstrap/Popover.js +++ b/Roo/bootstrap/Popover.js @@ -352,14 +352,30 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { case 'right': var exact = this.el.getAlignToXY(this.alignEl, 'tl-tr', [10,0]); var offset = this.el.getAlignToXY(this.alignEl, 'tl-tr?',[10,0]); - if (exact.equals(offset)) { - //normal display... - this.setXY(exact, this.preanim(arguments, 3)); - var xy = this.alignEl.getAnchorXY(p1, false); - + if (!try_move || exact.equals(offset) || exact[0] == offset[0] ) { + //normal display... or moved up/down. + this.setXY(offset); + var xy = this.alignEl.getAnchorXY('tr', false); + xy[0]+=2;xy[1]+=5; + this.arrowEl.setXY(xy); + return true; + } + return this.updatePosition('left', false); + + case 'left': + var exact = this.el.getAlignToXY(this.alignEl, 'tr-tl', [-10,0]); + var offset = this.el.getAlignToXY(this.alignEl, 'tl-tr?',[-10,0]); + if (!try_move || exact.equals(offset) || exact[0] == offset[0] ) { + //normal display... or moved up/down. + this.setXY(offset); + var xy = this.alignEl.getAnchorXY('tl', false); + xy[0]+=2;xy[1]+=5; + this.arrowEl.setXY(xy); + return true; } - - + return this.updatePosition('right', false); + + } @@ -369,7 +385,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { var xy = this.alignEl.getAnchorXY(p1, false); xy[0]+=2;xy[1]+=5; this.arrowEl.setXY(xy); - + return true; }, hide : function()