From 81a749d79034c792eff639f509766a9a6dda2e9a Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 28 Jan 2021 16:13:08 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js --- roojs-bootstrap-debug.js | 13 +++++++++++-- roojs-bootstrap.js | 30 +++++++++++++++--------------- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 8b87525e81..64583a7a9e 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -19655,8 +19655,14 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { getChildContainer : function() { + return this.contentEl; return this.el.select('.popover-content',true).first(); }, + getPopoverHeader : function() + { + return this.headerEl + } + getAutoCreate : function(){ @@ -19704,8 +19710,8 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { setContent: function(str) { this.html = str; - if (this.el) { - this.el.select('.popover-content',true).first().dom.innerHTML = str; + if (this.contentEl) { + this.contentEl.dom.innerHTML = str; } }, @@ -19744,6 +19750,9 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { Roo.EventManager.onWindowResize(this.resizeMask, this, true); + this.contentEl = this.el.select('.popover-content',true).first(); + this.headerEl = this.el.select('.popover-header',true).first(); + this.initEvents(); }, diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 12701bc269..cd8af67f8a 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -809,21 +809,21 @@ var C=this.calpopover.el.select('.popover-content',true).first();Roo.each(A,func var A=this;if(this.store.getCount()>0){this.store.data.each(function(d){A.addItem({id:d.data.id,start:(typeof(d.data.start_dt)==='string')?new Date.parseDate(d.data.start_dt,'Y-m-d H:i:s'):d.data.start_dt,end:(typeof(d.data.end_dt)==='string')?new Date.parseDate(d.data.end_dt,'Y-m-d H:i:s'):d.data.end_dt,time:d.data.start_time,title:d.data.title,description:d.data.description,venue:d.data.venue} );});}this.renderEvents();if(this.calevents.length&&this.loadMask){this.maskEl.hide();}},onBeforeLoad:function(){this.clearEvents();if(this.loadMask){this.maskEl.show();}}}); // Roo/bootstrap/Popover.js -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,getChildContainer:function(){return this.el.select('.popover-content',true).first(); -},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||''},{cls:'popover-content popover-body'+this.cls,html:this.html||''} -]}]};return A;},setTitle:function(A){this.title=A;if(this.el){this.el.select('.popover-title',true).first().dom.innerHTML=A;}},setContent:function(A){this.html=A;if(this.el){this.el.select('.popover-content',true).first().dom.innerHTML=A;}},onRender:function(ct,A){Roo.bootstrap.Component.superclass.onRender.call(this,ct,A); -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