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

Fix show/hide logic of inherited members.

Added extra div surrounding each subsection.
Subsections now also get correctly shown/hidden.
parent 24370c5c
Loading
Loading
Loading
Loading
+12 −8
Original line number Diff line number Diff line
@@ -159,16 +159,20 @@ Ext.define('Docs.view.cls.Overview', {
                '</tpl>',
                '<h3 class="members-title">{title}</h3>',
                '<tpl if="members.length">',
                    '<div class="subsection">',
                        '<tpl if="statics.length">',
                            '<div class="definedBy">Defined By</div>',
                            '<h4 class="members-subtitle">Instance {title}</h3>',
                        '</tpl>',
                        '{members}',
                    '</div>',
                '</tpl>',
                '<tpl if="statics.length">',
                    '<div class="subsection">',
                        '<div class="definedBy">Defined By</div>',
                        '<h4 class="members-subtitle">Static {title}</h3>',
                        '{statics}',
                    '</div>',
                '</tpl>',
            '</div>'
        );
+13 −5
Original line number Diff line number Diff line
@@ -166,11 +166,19 @@ Ext.define('Docs.view.cls.Toolbar', {
                section && Ext.get(section).setStyle({display: hide ? 'none' : 'block'});
            }

            // add first-child class to first member in section
            var sectionMembers = Ext.query(sectionId+' .member' + (hide ? ".not-inherited" : ""));
            if (sectionMembers.length > 0) {
                Ext.get(sectionMembers[0]).addCls('first-child');
            // add first-child class to first member in subsection
            Ext.Array.forEach(Ext.query(sectionId+" .subsection"), function(subsection) {
                var subsectionMembers = Ext.query('.member' + (hide ? ".not-inherited" : ""), subsection);
                if (subsectionMembers.length > 0) {
                    Ext.get(subsectionMembers[0]).addCls('first-child');
                    // make sure subsection is visible
                    Ext.get(subsection).setStyle({display: 'block'});
                }
                else {
                    // Hide subsection completely if empty
                    Ext.get(subsection).setStyle({display: 'none'});
                }
            }, this);

            if (this.memberButtons[type]) {
                var store = this.memberButtons[type].getStore();