From d1b5517fb8b9b4a9f691fe630669106333e0d056 Mon Sep 17 00:00:00 2001 From: john Date: Wed, 14 Mar 2018 18:03:22 +0800 Subject: [PATCH] Roo/bootstrap/panel/Content.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/panel/Content.js | 2 +- roojs-bootstrap-debug.js | 11 +++++++++-- roojs-bootstrap.js | 6 +++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Roo/bootstrap/panel/Content.js b/Roo/bootstrap/panel/Content.js index b3646c734e..72b47226f1 100644 --- a/Roo/bootstrap/panel/Content.js +++ b/Roo/bootstrap/panel/Content.js @@ -152,7 +152,7 @@ Roo.bootstrap.panel.Content = function( config){ * Fires when this tab is created * @param {Roo.ContentPanel} this */ - "render" : true + "render" : true, /** * @event beforerender diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index 1b6e7d8600..c934cac845 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -36388,7 +36388,14 @@ Roo.bootstrap.panel.Content = function( config){ * Fires when this tab is created * @param {Roo.ContentPanel} this */ - "render" : true + "render" : true, + + /** + * @event beforerender + * Fires before this tab is created + * @param {Roo.ContentPanel} this + */ + "beforerender" : true @@ -38474,7 +38481,7 @@ Roo.extend(Roo.bootstrap.PhoneInput, Roo.bootstrap.TriggerField, { * iso2 and abbr for all countries * @type Object */ - List : [ + list : [ ["Afghanistan (‫افغانستان‬‎)", "af", "93"], ["Albania (Shqipëri)", "al", "355"], ["Algeria (‫الجزائر‬‎)", "dz", "213"], diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index 819b9a45e1..2ba5173ad5 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1539,8 +1539,8 @@ Roo.namespace("Roo.bootstrap.panel"); Roo.bootstrap.panel.Content=function(A){this.tpl=A.tpl||false;var el=A.el;var B=A.content;if(A.autoCreate){el=Roo.id();}this.el=Roo.get(el);if(!this.el&&A&&A.autoCreate){if(typeof A.autoCreate=="object"){if(!A.autoCreate.id){A.autoCreate.id=A.id||el;}this.el=Roo.DomHelper.append(document.body,A.autoCreate,true); }else{var C={tag:"div",cls:"roo-layout-inactive-content",id:A.id||el};if(A.html){C.html=A.html;}this.el=Roo.DomHelper.append(document.body,C,true);}}this.closable=false;this.loaded=false;this.active=false;if(A.toolbar&&!A.toolbar.el&&A.toolbar.xtype){this.toolbar=new A.toolbar.xns[A.toolbar.xtype](A.toolbar); 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