From b36899e4a3c7b5187ca1a259d5ed3ab462ac3ee4 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 30 Nov 2018 13:02:21 +0800 Subject: [PATCH] Roo/bootstrap/panel/Tabs.js roojs-bootstrap.js roojs-bootstrap-debug.js --- Roo/bootstrap/panel/Tabs.js | 2 ++ roojs-bootstrap-debug.js | 16 +++++++++++++--- roojs-bootstrap.js | 13 +++++++------ 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Roo/bootstrap/panel/Tabs.js b/Roo/bootstrap/panel/Tabs.js index 8be3d081df..7bd0fa006e 100644 --- a/Roo/bootstrap/panel/Tabs.js +++ b/Roo/bootstrap/panel/Tabs.js @@ -388,6 +388,8 @@ Roo.extend(Roo.bootstrap.panel.Tabs, Roo.util.Observable, { } if (vcount < 2) { this.stripEl.hide(); + } else { + this.stripEl.show(); } var w = Math.max(this.el.getWidth() - this.cpad, 10); diff --git a/roojs-bootstrap-debug.js b/roojs-bootstrap-debug.js index c687b71675..0b09a97ee5 100644 --- a/roojs-bootstrap-debug.js +++ b/roojs-bootstrap-debug.js @@ -38083,9 +38083,11 @@ Roo.extend(Roo.bootstrap.panel.Tabs, Roo.util.Observable, { * Adds an existing {@link Roo.TabPanelItem}. * @param {Roo.TabPanelItem} item The TabPanelItem to add */ - addTabItem : function(item){ + addTabItem : function(item) + { this.items[item.id] = item; this.items.push(item); + // if(this.resizeTabs){ // item.setWidth(this.currentTabWidth || this.preferredTabWidth); // this.autoSizeTabs(); @@ -38167,7 +38169,8 @@ Roo.extend(Roo.bootstrap.panel.Tabs, Roo.util.Observable, { * @param {String/Number} id The id or index of the TabPanelItem to activate. * @return {Roo.TabPanelItem} The TabPanelItem. */ - activate : function(id){ + activate : function(id) + { var tab = this.items[id]; if(!tab){ return null; @@ -38233,12 +38236,19 @@ Roo.extend(Roo.bootstrap.panel.Tabs, Roo.util.Observable, { /** * Manual call to resize the tabs (if {@link #resizeTabs} is false this does nothing) */ - autoSizeTabs : function(){ + autoSizeTabs : function() + { var count = this.items.length; var vcount = count - this.hiddenCount; if(!this.resizeTabs || count < 1 || vcount < 1 || this.updating) { return; } + if (vcount < 2) { + this.stripEl.hide(); + } else { + this.stripEl.show(); + } + var w = Math.max(this.el.getWidth() - this.cpad, 10); var availWidth = Math.floor(w / vcount); var b = this.stripBody; diff --git a/roojs-bootstrap.js b/roojs-bootstrap.js index efee5997b3..8008f3258e 100644 --- a/roojs-bootstrap.js +++ b/roojs-bootstrap.js @@ -1622,12 +1622,13 @@ var C=A;while(Cw){var D=this.items; -this.setTabWidth(Math.max(C,this.minTabWidth)-2);if(C{text}'):(''+'{text}')); +},autoSizeTabs:function(){var A=this.items.length;var B=A-this.hiddenCount;if(!this.resizeTabs||A<1||B<1||this.updating){return;}if(B<2){this.stripEl.hide();}else{this.stripEl.show();}var w=Math.max(this.el.getWidth()-this.cpad,10);var C=Math.floor(w/B);var b=this.stripBody; +if(b.getWidth()>w){var D=this.items;this.setTabWidth(Math.max(C,this.minTabWidth)-2);if(C{text}'):(''+'{text}')); }switch(typeof(E)){case 'object':break;case 'string':E=new Roo.Template(E);break;default:break;}var el=E.overwrite(td,{"text":B});var F=el.getElementsByTagName("span")[0];return {"el":el,"inner":F};}}); // Roo/bootstrap/panel/TabItem.js Roo.bootstrap.panel.TabItem=function(A){this.tabPanel=A.panel;this.id=A.id;this.disabled=false;this.text=A.text;this.loaded=false;this.closable=A.closable;this.bodyEl=Roo.get(this.tabPanel.createItemBody(this.tabPanel.bodyEl.dom,A.id));this.bodyEl.setVisibilityMode(Roo.Element.VISIBILITY); -- 2.39.2