From 1c02e9b84d4c1949d11b2f9662d69f077791bc89 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Tue, 2 Feb 2021 10:18:45 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js --- roojs-bootstrap-debug.js | 3 +++ roojs-bootstrap.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 3e226dbf5d..e43e5b51f1 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -39476,6 +39476,7 @@ Roo.extend(Roo.bootstrap.layout.West, Roo.bootstrap.layout.Split, { * @cfg {String/Object} params When used with {@link #url}, calls {@link #setUrl} with this value * @cfg {Boolean} loadOnce When used with {@link #url}, calls {@link #setUrl} with this value * @cfg {String} content Raw content to fill content panel with (uses setContent on construction.) + * @cfg {Boolean} iframe contents are an iframe - makes showing remote sources/CSS feasible.. * @cfg {Boolean} badges render the badges * @cfg {String} cls extra classes to use * @cfg {String} background (primary|secondary|success|info|warning|danger|light|dark) @@ -39653,6 +39654,8 @@ Roo.extend(Roo.bootstrap.panel.Content, Roo.bootstrap.Component, { tabTip : '', + iframe : false, + setRegion : function(region){ this.region = region; this.setActiveClass(region && !this.background); diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index f00558831f..b90b7ce244 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1704,7 +1704,7 @@ if(A.toolbar&&!A.toolbar.el&&A.toolbar.xtype){this.toolbar=new A.toolbar.xns[A.t i