From 9ccf4a5c0a7a48ebd4863aeecd281185faaaea91 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 28 Jan 2021 16:13:43 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/Popover.js --- Roo/bootstrap/Popover.js | 2 +- roojs-bootstrap-debug.js | 11 +++++++---- roojs-bootstrap.js | 14 +++++++------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/Roo/bootstrap/Popover.js b/Roo/bootstrap/Popover.js index 1f6cf7baea..9d4b263435 100644 --- a/Roo/bootstrap/Popover.js +++ b/Roo/bootstrap/Popover.js @@ -184,7 +184,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { } - this.el.select('.popover-title',true).setVisibilityMode(Roo.Element.DISPLAY); + this.headerEl.setVisibilityMode(Roo.Element.DISPLAY); this.el.enableDisplayMode('block'); this.el.hide(); if (this.over === false && !this.parent()) { diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 64583a7a9e..ccb7e8e33e 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -19652,16 +19652,19 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { can_build_overlaid : false, maskEl : false, // the mask element + headerEl : false, + contentEl : false, + getChildContainer : function() { return this.contentEl; - return this.el.select('.popover-content',true).first(); + }, getPopoverHeader : function() { return this.headerEl - } + }, getAutoCreate : function(){ @@ -19700,7 +19703,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { { this.title = str; if (this.el) { - this.el.select('.popover-title',true).first().dom.innerHTML = str; + this.headerEl.dom.innerHTML = str; } }, @@ -19772,7 +19775,7 @@ Roo.extend(Roo.bootstrap.Popover, Roo.bootstrap.Component, { } - this.el.select('.popover-title',true).setVisibilityMode(Roo.Element.DISPLAY); + this.headerEl.setVisibilityMode(Roo.Element.DISPLAY); this.el.enableDisplayMode('block'); this.el.hide(); if (this.over === false && !this.parent()) { diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index cd8af67f8a..5b2872f201 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -809,13 +809,13 @@ 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.contentEl; -return this.el.select('.popover-content',true).first();},getPopoverHeader:function(){return this.headerEl}getAutoCreate:function(){var cfg={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 cfg;},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.contentEl){this.contentEl.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