X-Git-Url: http://git.ithinksw.org/extjs.git/blobdiff_plain/0494b8d9b9bb03ab6c22b34dae81261e3cd7e3e6..7a654f8d43fdb43d78b63d90528bed6e86b608cc:/examples/history/history.js

diff --git a/examples/history/history.js b/examples/history/history.js
index aee7c1ab..15d702b6 100644
--- a/examples/history/history.js
+++ b/examples/history/history.js
@@ -1,91 +1,124 @@
-/*!
- * Ext JS Library 3.3.1
- * Copyright(c) 2006-2010 Sencha Inc.
- * licensing@sencha.com
- * http://www.sencha.com/license
- */
+Ext.require([
+    'Ext.util.History',
+    'Ext.tab.Panel'
+]);
 
 Ext.onReady(function() {
-    
     // The only requirement for this to work is that you must have a hidden field and
     // an iframe available in the page with ids corresponding to Ext.History.fieldId
     // and Ext.History.iframeId.  See history.html for an example.
     Ext.History.init();
-    
+
     // Needed if you want to handle history for multiple components in the same page.
     // Should be something that won't be in component ids.
     var tokenDelimiter = ':';
     
-    var tp = new Ext.TabPanel({
+    function onTabChange(tabPanel, tab) {
+        var tabs = [],
+            ownerCt = tabPanel.ownerCt, 
+            oldToken, newToken;
+
+        tabs.push(tab.id);
+        tabs.push(tabPanel.id);
+
+        while (ownerCt && ownerCt.is('tabpanel')) {
+            tabs.push(ownerCt.id);
+            ownerCt = ownerCt.ownerCt;
+        }
+        
+        newToken = tabs.reverse().join(tokenDelimiter);
+        
+        oldToken = Ext.History.getToken();
+       
+        if (oldToken === null || oldToken.search(newToken) === -1) {
+            Ext.History.add(newToken);
+        }
+    }
+    
+    // Handle this change event in order to restore the UI to the appropriate history state
+    function onAfterRender() {
+        Ext.History.on('change', function(token) {
+            var parts, tabPanel, length, i;
+            
+            if (token) {
+                parts = token.split(tokenDelimiter);
+                length = parts.length;
+                
+                // setActiveTab in all nested tabs
+                for (i = 0; i < length - 1; i++) {
+                    Ext.getCmp(parts[i]).setActiveTab(Ext.getCmp(parts[i + 1]));
+                }
+            }
+        });
+        
+        // This is the initial default state.  Necessary if you navigate starting from the
+        // page without any existing history token params and go back to the start state.
+        var activeTab1 = Ext.getCmp('main-tabs').getActiveTab(),
+            activeTab2 = activeTab1.getActiveTab();
+            
+        onTabChange(activeTab1, activeTab2);
+    }
+    
+    Ext.create('Ext.TabPanel', {
         renderTo: Ext.getBody(),
         id: 'main-tabs',
         height: 300,
         width: 600,
         activeTab: 0,
+        defaults: {
+            padding: 10
+        },
         
         items: [{
             xtype: 'tabpanel',
             title: 'Tab 1',
             id: 'tab1',
             activeTab: 0,
-            tabPosition: 'bottom',
+            padding: 5,
+            border: true,
+            plain: true,
             
+            defaults: {
+                padding: 10
+            },
+
             items: [{
                 title: 'Sub-tab 1',
-                id: 'subtab1'
+                id: 'subtab1',
+                html: 'Sub-tab 1 content'
             },{
                 title: 'Sub-tab 2',
-                id: 'subtab2'
+                id: 'subtab2',
+                html: 'Sub-tab 2 content'
             },{
                 title: 'Sub-tab 3',
-                id: 'subtab3'
+                id: 'subtab3',
+                html: 'Sub-tab 3 content'
             }],
             
             listeners: {
-                'tabchange': function(tabPanel, tab){
-                    Ext.History.add(tabPanel.id + tokenDelimiter + tab.id);
-                }
+                tabchange: onTabChange
             }
         },{
             title: 'Tab 2',
-            id: 'tab2'
+            id: 'tab2',
+            html: 'Tab 2 content'
         },{
             title: 'Tab 3',
-            id: 'tab3'
+            id: 'tab3',
+            html: 'Tab 3 content'
         },{
             title: 'Tab 4',
-            id: 'tab4'
+            id: 'tab4',
+            html: 'Tab 4 content'
         },{
             title: 'Tab 5',
-            id: 'tab5'
+            id: 'tab5',
+            html: 'Tab 5 content'
         }],
-        
         listeners: {
-            'tabchange': function(tabPanel, tab){
-                // Ignore tab1 since it is a separate tab panel and we're managing history for it also.
-                // We'll use its handler instead in that case so we don't get duplicate nav events for sub tabs.
-                if(tab.id != 'tab1'){
-                    Ext.History.add(tabPanel.id + tokenDelimiter + tab.id);
-                }
-            }
+            tabchange: onTabChange,
+            afterrender: onAfterRender 
         }
     });
-    
-    // Handle this change event in order to restore the UI to the appropriate history state
-    Ext.History.on('change', function(token){
-        if(token){
-            var parts = token.split(tokenDelimiter);
-            var tabPanel = Ext.getCmp(parts[0]);
-            var tabId = parts[1];
-            
-            tabPanel.show();
-            tabPanel.setActiveTab(tabId);
-        }else{
-            // This is the initial default state.  Necessary if you navigate starting from the
-            // page without any existing history token params and go back to the start state.
-            tp.setActiveTab(0);
-            tp.getItem(0).setActiveTab(0);
-        }
-    });
-    
 });
\ No newline at end of file