Upgrade to ExtJS 3.1.0 - Released 12/16/2009
[extjs.git] / examples / ux / GroupTab.js
index 0fa0a72..8c1dfe1 100644 (file)
@@ -1,5 +1,5 @@
 /*!
 /*!
- * Ext JS Library 3.0.3
+ * Ext JS Library 3.1.0
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
  * Copyright(c) 2006-2009 Ext JS, LLC
  * licensing@extjs.com
  * http://www.extjs.com/license
@@ -64,20 +64,19 @@ Ext.ux.GroupTab = Ext.extend(Ext.Container, {
      */\r
     setActiveTab : function(item){\r
         item = this.getComponent(item);\r
      */\r
     setActiveTab : function(item){\r
         item = this.getComponent(item);\r
-        if(!item || this.fireEvent('beforetabchange', this, item, this.activeTab) === false){\r
-            return;\r
+        if(!item){\r
+            return false;\r
         }\r
         if(!this.rendered){\r
             this.activeTab = item;\r
         }\r
         if(!this.rendered){\r
             this.activeTab = item;\r
-            return;\r
+            return true;\r
         }\r
         }\r
-        if(this.activeTab != item){\r
+        if(this.activeTab != item && this.fireEvent('beforetabchange', this, item, this.activeTab) !== false){\r
             if(this.activeTab && this.activeTab != this.mainItem){\r
                 var oldEl = this.getTabEl(this.activeTab);\r
                 if(oldEl){\r
                     Ext.fly(oldEl).removeClass('x-grouptabs-strip-active');\r
                 }\r
             if(this.activeTab && this.activeTab != this.mainItem){\r
                 var oldEl = this.getTabEl(this.activeTab);\r
                 if(oldEl){\r
                     Ext.fly(oldEl).removeClass('x-grouptabs-strip-active');\r
                 }\r
-                this.activeTab.fireEvent('deactivate', this.activeTab);\r
             }\r
             var el = this.getTabEl(item);\r
             Ext.fly(el).addClass('x-grouptabs-strip-active');\r
             }\r
             var el = this.getTabEl(item);\r
             Ext.fly(el).addClass('x-grouptabs-strip-active');\r
@@ -92,9 +91,10 @@ Ext.ux.GroupTab = Ext.extend(Ext.Container, {
                 this.scrollToTab(item, this.animScroll);\r
             }\r
 \r
                 this.scrollToTab(item, this.animScroll);\r
             }\r
 \r
-            item.fireEvent('activate', item);\r
             this.fireEvent('tabchange', this, item);\r
             this.fireEvent('tabchange', this, item);\r
+            return true;\r
         }\r
         }\r
+        return false;\r
     },\r
     \r
     getTabEl: function(item){\r
     },\r
     \r
     getTabEl: function(item){\r