Roo/bootstrap/TabGroup.js

diff --git a/Roo/bootstrap/TabGroup.js b/Roo/bootstrap/TabGroup.js
index d634730..95cc947 100644 (file)
--- a/Roo/bootstrap/TabGroup.js
+++ b/Roo/bootstrap/TabGroup.js
@@ -176,7 +176,7 @@ Roo.extend(Roo.bootstrap.TabGroup, Roo.bootstrap.Column,  {
      */
     showPanel : function (pan)
     {
-        if(this.transition){
+        if(this.transition || typeof(pan) == 'undefined'){
             Roo.log("waiting for the transitionend");
             return;
         }
@@ -189,12 +189,16 @@ Roo.extend(Roo.bootstrap.TabGroup, Roo.bootstrap.Column,  {
             pan = this.getPanelByName(pan);
         }
         
+        var cur = this.getActivePanel();
+        
+        if(!pan || !cur){
+            return;
+        }
+        
         if (pan.tabId == this.getActivePanel().tabId) {
             return true;
         }
         
-        var cur = this.getActivePanel();
-        
         if (false === cur.fireEvent('beforedeactivate')) {
             return false;
         }