From a66da26f2c682361a4ab573dd01f907edc9b9db8 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 28 Jan 2021 16:48:39 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js --- roojs-bootstrap-debug.js | 6 ++++-- roojs-bootstrap.js | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 1723ce0a21..398ba12b88 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -19724,8 +19724,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { { Roo.bootstrap.Component.superclass.onRender.call(this, ct, position); - this.contentEl = this.el.select('.popover-content',true).first(); - this.headerEl = this.el.select('.popover-title',true).first(); + if(!this.el){ var cfg = Roo.apply({}, this.getAutoCreate()); @@ -19742,6 +19741,9 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { // Roo.log(this.el); } + this.contentEl = this.el.select('.popover-content',true).first(); + this.headerEl = this.el.select('.popover-title',true).first(); + var nitems = []; if(typeof(this.items) != 'undefined'){ var items = this.items; diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 56b5e9cb19..df264d0538 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -812,18 +812,18 @@ var A=this;if(this.store.getCount()>0){this.store.data.each(function(d){A.addIte Roo.bootstrap.Popover=function(A){Roo.bootstrap.Popover.superclass.constructor.call(this,A);this.addEvents({"show":true,"hide":true});};Roo.extend(Roo.bootstrap.Popover,Roo.bootstrap.Component,{title:false,html:false,placement:'right',trigger:'hover',modal:false,delay:0,over:false,can_build_overlaid:false,maskEl:false,headerEl:false,contentEl:false,getChildContainer:function(){return this.contentEl; },getPopoverHeader:function(){this.title=true;return this.headerEl},getAutoCreate:function(){var A={cls:'popover roo-dynamic shadow roo-popover'+(this.modal?'-modal':''),style:'display:block',cn:[{cls:'arrow'},{cls:'popover-inner ',cn:[{tag:'h3',cls:'popover-title popover-header',html:this.title===false?'':this.title} ,{cls:'popover-content popover-body '+(this.cls||''),html:this.html||''}]}]};return A;},setTitle:function(A){this.title=A;if(this.el){this.headerEl.dom.innerHTML=A;}},setContent:function(A){this.html=A;if(this.contentEl){this.contentEl.dom.innerHTML=A;}},onRender:function(ct,A){Roo.bootstrap.Component.superclass.onRender.call(this,ct,A); -this.contentEl=this.el.select('.popover-content',true).first();this.headerEl=this.el.select('.popover-title',true).first();if(!this.el){var B=Roo.apply({},this.getAutoCreate());B.id=Roo.id();if(this.cls){B.cls+=' '+this.cls;}if(this.style){B.style=this.style; -}this.el=Roo.get(document.body).createChild(B,A);}var C=[];if(typeof(this.items)!='undefined'){var D=this.items;delete this.items;for(var i=0;i