Commit edf1853d authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Fix activating tabs on page reload.

parent de199a4c

template/app/controller/Tabs.js

+7 −3
Original line number Diff line number Diff line
@@ -89,16 +89,20 @@ Ext.define('Docs.controller.Tabs', { 
    onLaunch: function() {

        var tabs = Docs.Settings.get('tabs');

        if (tabs) {

            Ext.Array.forEach(tabs, this.addTabFromTree, this);

            Ext.Array.forEach(tabs, function(url) {

                this.addTabFromTree(url, {});

            }, this);

        }

    },



    /**

     * Adds a tab based on information from the class tree

     * @param {String} url The url of the record in the tree

     * @param {Object} [opts={animate: true, activate: true}] Specify to override defaults.

     * @private

     */

    addTabFromTree: function(url) {

    addTabFromTree: function(url, opts) {

        opts = opts || { animate: true, activate: true };

        var tree = this.getTree(url);

        var treeRecord = tree.findRecordByUrl(url);

        if (treeRecord && treeRecord.raw) {
@@ -111,7 +115,7 @@ Ext.define('Docs.controller.Tabs', { 
                href: treeRecord.raw.url,

                text: treeRecord.raw.text,

                iconCls: treeRecord.raw.iconCls

            }, { animate: true, activate: true });

            }, opts);

        }

    },

template/app/view/Tabs.js

+3 −1
Original line number Diff line number Diff line
@@ -85,7 +85,9 @@ Ext.define('Docs.view.Tabs', { 
            }

            this.addTabToOverflow(tab, opts);

        }

        if (opts.activate) {

            this.activateTab(tab.href);

        }



        if (this.tabs.length > this.maxTabsInBar()) {

            Ext.get('tabOverflow').show();