From dbc14c8c5e550b6421884b7fa464f8ad2823bebf Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 4 Jan 2021 14:16:45 +0800 Subject: [PATCH] roojs-bootstrap.js roojs-bootstrap-debug.js Roo/bootstrap/panel/Content.js --- Roo/bootstrap/panel/Content.js | 3 +++ roojs-bootstrap-debug.js | 14 ++++++++++---- roojs-bootstrap.js | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Roo/bootstrap/panel/Content.js b/Roo/bootstrap/panel/Content.js index a972b7335b..a30de1f08c 100644 --- a/Roo/bootstrap/panel/Content.js +++ b/Roo/bootstrap/panel/Content.js @@ -197,6 +197,9 @@ Roo.bootstrap.panel.Content = function( config){ Roo.extend(Roo.bootstrap.panel.Content, Roo.bootstrap.Component, { + cls : '', + background : '', + tabTip : '', setRegion : function(region){ diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 88c84fe6b0..73850b1679 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -39152,6 +39152,8 @@ Roo.extend(Roo.bootstrap.layout.West, Roo.bootstrap.layout.Split, { * @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} badges render the badges + * @cfg {String} cls extra classes to use + * @cfg {String} background (primary|secondary|success|info|warning|danger|light|dark) * @constructor * Create a new ContentPanel. @@ -39179,10 +39181,11 @@ Roo.bootstrap.panel.Content = function( config){ this.el = Roo.DomHelper.append(document.body, config.autoCreate, true); }else{ - var elcfg = { tag: "div", - cls: "roo-layout-inactive-content", - id: config.id||el - }; + var elcfg = { + tag: "div", + cls: "roo-layout-inactive-content", + id: config.id||el + }; if (config.html) { elcfg.html = config.html; @@ -39318,6 +39321,9 @@ Roo.bootstrap.panel.Content = function( config){ Roo.extend(Roo.bootstrap.panel.Content, Roo.bootstrap.Component, { + cls : '', + background : '', + tabTip : '', setRegion : function(region){ diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 407e210a87..441e694f77 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1688,7 +1688,7 @@ Roo.bootstrap.panel.Content=function(A){this.tpl=A.tpl||false;var el=A.el;var B= this.wrapEl=this.el;var ti=[];if(A.toolbar.items){ti=A.toolbar.items;delete A.toolbar.items;}var D=[];this.toolbar.render(this.wrapEl,'before');for(var i=0;i