From: Alan Knowles Date: Thu, 11 Feb 2021 04:24:45 +0000 (+0800) Subject: roojs-bootstrap.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=1a8298ef4266dd096edeb289f57e191c2b9a39ff roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Popover.js --- diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 6fbdf1dc26..5a7d531ead 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -19953,7 +19953,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { 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); + this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('tr', false); xy[0]+=2;xy[1]+=5; this.arrowEl.setXY(xy); @@ -19968,7 +19968,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { var offset = this.el.getAlignToXY(this.alignEl, 'tr-tl?',[-10,0]); if (!try_move || exact.equals(offset) || exact[0] == offset[0] ) { //normal display... or moved up/down. - this.setXY(offset); + this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('tl', false); xy[0]+=2;xy[1]+=5; // << fix me this.arrowEl.setXY(xy); @@ -19982,7 +19982,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { var offset = this.el.getAlignToXY(this.alignEl, 't-b?',[0,-10]); if (!try_move || exact.equals(offset) || exact[1] == offset[1] ) { //normal display... or moved up/down. - this.setXY(offset); + this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('b', false); xy[0]+=2;xy[1]+=5; // << fix me this.arrowEl.setXY(xy); @@ -19996,7 +19996,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { var offset = this.el.getAlignToXY(this.alignEl, 'b-t?',[0,10]); if (!try_move || exact.equals(offset) || exact[1] == offset[1] ) { //normal display... or moved up/down. - this.setXY(offset); + this.el.setXY(offset); var xy = this.alignEl.getAnchorXY('t', false); xy[0]+=2;xy[1]+=5; // << fix me this.arrowEl.setXY(xy); diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 6cd19cfdc1..98d43f79f6 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -823,10 +823,10 @@ A=A||false;if(!A){if(this.parent()&&(this.over=='parent'||(this.over===false))){ this.el.dom.style.display='block';if(this.alignEl){this.updatePosition(this.placement,true);}else{var es=this.el.getSize();var x=Roo.lib.Dom.getViewWidth()/2;var y=Roo.lib.Dom.getViewHeight()/2;this.el.setXY([x-(es.width/2),y-(es.height/2)]);}this.el.addClass('in'); this.hoverState='in';if(this.modal){this.maskEl.setSize(Roo.lib.Dom.getViewWidth(true),Roo.lib.Dom.getViewHeight(true));this.maskEl.setStyle('z-index',Roo.bootstrap.Popover.zIndex++);this.maskEl.dom.style.display='block';this.maskEl.addClass('show');}this.el.setStyle('z-index',Roo.bootstrap.Popover.zIndex++); this.fireEvent('show',this);},updatePosition:function(A,B){A=A===false?this.placement:A;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+' roo-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.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.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,'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.setXY(D); -var xy=this.alignEl.getAnchorXY('b',false);xy[0]+=2;xy[1]+=5;this.arrowEl.setXY(xy);return true;}B=false;case 'bottom':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.setXY(D); +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,'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;}B=false;case 'bottom':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[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(); 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);