From 06a984043306509ae79b93286a0c551fa8b09ff0 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 2 Feb 2021 10:23:00 +0800 Subject: [PATCH] Roo/bootstrap/panel/Content.js --- Roo/bootstrap/panel/Content.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Roo/bootstrap/panel/Content.js b/Roo/bootstrap/panel/Content.js index 798d3db24f..617937f15b 100644 --- a/Roo/bootstrap/panel/Content.js +++ b/Roo/bootstrap/panel/Content.js @@ -81,6 +81,10 @@ Roo.bootstrap.panel.Content = function( config){ } this.el = Roo.DomHelper.append(document.body, elcfg , true); + if (this.iframe) { + this.iframeEl = this.el.select('iframe',true).first(); + } + } } this.closable = false; @@ -177,7 +181,7 @@ Roo.bootstrap.panel.Content = function( config){ - if(this.autoScroll){ + if(this.autoScroll && !this.iframe){ this.resizeEl.setStyle("overflow", "auto"); } else { // fix randome scrolling @@ -256,11 +260,15 @@ Roo.extend(Roo.bootstrap.panel.Content, Roo.bootstrap.Component, { return true; }, /** - * Updates this panel's element + * Updates this panel's element (not for iframe) * @param {String} content The new content * @param {Boolean} loadScripts (optional) true to look for and process scripts */ setContent : function(content, loadScripts){ + if (this.iframe) { + return; + } + this.el.update(content, loadScripts); }, -- 2.39.2