From ed5e6974f27c38d42b836169df2c1ba46fec47c9 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 25 Jun 2021 16:06:26 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js --- roojs-bootstrap-debug.js | 13 +++++++------ roojs-bootstrap.js | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 799db2a620..f88b100f67 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -20399,16 +20399,18 @@ Roo.apply(Roo.bootstrap.Popover, { clickHander : false, + onMouseDown : function(e) { - if (this.popup.length, !e.getTarget(".roo-popover") && this.popup.length) { + if (this.popup.length && !e.getTarget(".roo-popover") && this.popup.length) { /// what is nothing is showing.. this.hideAll(); } }, + popups : [], register : function(popup) @@ -20417,8 +20419,8 @@ Roo.apply(Roo.bootstrap.Popover, { Roo.bootstrap.Popover.clickHandler = Roo.get(document).on("mousedown", Roo.bootstrap.Popover.onMouseDown, Roo.bootstrap.Popover); } // hide other popups. - popup.on('show', Roo.bootstrap.Popover.onShow); - popup.on('hide', Roo.bootstrap.Popover.onHide); + popup.on('show', Roo.bootstrap.Popover.onShow, Roo.bootstrap.Popover, popup); + popup.on('hide', Roo.bootstrap.Popover.onHide, Roo.bootstrap.Popover, popup); this.hideAll(); this.popups.push(popup); }, @@ -20428,9 +20430,8 @@ Roo.apply(Roo.bootstrap.Popover, { p.hide(); }); }, - unregister : function(popup) - { - + onShow : function(p) { + this.popups.push(p); } });/* diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 8143c9a9b0..24e2f4a9dd 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -841,8 +841,9 @@ var xy=this.alignEl.getAnchorXY('tl',false);xy[0]-=10;xy[1]+=5;this.arrowEl.setX 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;}return this.updatePosition('bottom',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']} -,zIndex:20001,clickHander:false,onMouseDown:function(e){if(this.popup.length,!e.getTarget(".roo-popover")&&this.popup.length){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); -}A.on('show',Roo.bootstrap.Popover.onShow);A.on('hide',Roo.bootstrap.Popover.onHide);this.hideAll();this.popups.push(A);},hideAll:function(){this.popups.forEach(function(p){p.hide();});},unregister:function(A){}}); +,zIndex:20001,clickHander:false,onMouseDown:function(e){if(this.popup.length&&!e.getTarget(".roo-popover")&&this.popup.length){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); +}A.on('show',Roo.bootstrap.Popover.onShow,Roo.bootstrap.Popover,A);A.on('hide',Roo.bootstrap.Popover.onHide,Roo.bootstrap.Popover,A);this.hideAll();this.popups.push(A);},hideAll:function(){this.popups.forEach(function(p){p.hide();});},onShow:function(p){this.popups.push(p); +}}); // Roo/bootstrap/PopoverNav.js Roo.bootstrap.PopoverNav=function(A){Roo.bootstrap.PopoverNav.superclass.constructor.call(this,A);};Roo.extend(Roo.bootstrap.PopoverNav,Roo.bootstrap.NavSimplebar,{container_method:'getPopoverHeader'}); // Roo/bootstrap/Progress.js -- 2.39.2