From: Alan Knowles Date: Thu, 11 Feb 2021 04:09:02 +0000 (+0800) Subject: roojs-bootstrap.js X-Git-Url: http://git.roojs.org/?p=roojs1;a=commitdiff_plain;h=f56772d50f1d829bff01e09914c11f69796f0615 roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Popover.js --- diff --git a/Roo/bootstrap/Popover.js b/Roo/bootstrap/Popover.js index de5feff9d1..061971e4e1 100644 --- a/Roo/bootstrap/Popover.js +++ b/Roo/bootstrap/Popover.js @@ -342,6 +342,10 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { */ updatePosition : function(placement, try_move) { + this.el.removeClass([ + 'fade','top','bottom', 'left', 'right','in', + 'bs-popover-top','bs-popover-bottom', 'bs-popover-left', 'bs-popover-right' + ]); this.el.addClass(placement + ' roo-popover-' + placement); if (!this.alignEl ) { diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index f926485f15..3294f2cd6d 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -19938,6 +19938,10 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { */ updatePosition : function(placement, try_move) { + this.el.removeClass([ + 'fade','top','bottom', 'left', 'right','in', + 'bs-popover-top','bs-popover-bottom', 'bs-popover-left', 'bs-popover-right' + ]); this.el.addClass(placement + ' roo-popover-' + placement); if (!this.alignEl ) { @@ -19962,7 +19966,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { case 'left': var exact = this.el.getAlignToXY(this.alignEl, 'tr-tl', [-10,0]); - var offset = this.el.getAlignToXY(this.alignEl, 'tl-tr?',[-10,0]); + 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); @@ -19980,24 +19984,33 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { if (!try_move || exact.equals(offset) || exact[1] == offset[1] ) { //normal display... or moved up/down. this.setXY(offset); - var xy = this.alignEl.getAnchorXY('tl', false); + var xy = this.alignEl.getAnchorXY('b', false); xy[0]+=2;xy[1]+=5; // << fix me this.arrowEl.setXY(xy); return true; } - return this.updatePosition('right', false); + // fall through + try_move = false; + + case 'bottom': + var exact = this.el.getAlignToXY(this.alignEl, 'b-t', [0,10]); + 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); + var xy = this.alignEl.getAnchorXY('t', false); + xy[0]+=2;xy[1]+=5; // << fix me + this.arrowEl.setXY(xy); + return true; + } + // fall through + return this.updatePosition('top', false); } - - // work out the pointy position. - var p1 = this.alignment[0].split('-').pop().replace('?',''); - var xy = this.alignEl.getAnchorXY(p1, false); - xy[0]+=2;xy[1]+=5; - this.arrowEl.setXY(xy); - return true; + return false; }, hide : function() diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 1cbd9ad8db..8571ca6c07 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -822,12 +822,13 @@ var B=this.trigger?this.trigger.split(' '):[];Roo.each(B,function(C){if(C=='clic A=A||false;if(!A){if(this.parent()&&(this.over=='parent'||(this.over===false))){A=this.parent().el;}else if(this.over){Roo.get(this.over);}}if(!this.el){this.render(document.body);}this.el.removeClass(['fade','top','bottom','left','right','in','bs-popover-top','bs-popover-bottom','bs-popover-left','bs-popover-right']); if(this.title===false){this.headerEl.hide();}this.el.show();this.el.dom.style.display='block';this.el.addClass(B+' roo-popover-'+B);if(A){this.updatePosition();}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){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,'tl-tr?',[-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('tl',false); -xy[0]+=2;xy[1]+=5;this.arrowEl.setXY(xy);return true;}return this.updatePosition('right',false);}var p1=this.alignment[0].split('-').pop().replace('?','');var xy=this.alignEl.getAnchorXY(p1,false);xy[0]+=2;xy[1]+=5;this.arrowEl.setXY(xy);return true;},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']} +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){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); +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); }this.hideAll();this.popups.push(A);},hideAll:function(){this.popups.forEach(function(p){p.hide();});}}); // Roo/bootstrap/PopoverNav.js