Commit 0219d919 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Refactor class tree logic switching. 

- Use button instead of div.cls-group - just to have one class less.
- Don't do the switching when clicking on already selected button.
  The old code contained a check for it, but it didn't work as
  selected and clicked were always different.
parent d8966c27

template/app/controller/Classes.js

+6 −6
Original line number Diff line number Diff line
@@ -84,22 +84,22 @@ Ext.define('Docs.controller.Classes', { 
                afterrender: function(cmp) {

                    cmp.el.addListener('click', function(e, el) {

                        var clicked = Ext.get(el),

                            selected = Ext.query('.cls-group.selected');

                            selected = Ext.get(Ext.query('.cls-grouping button.selected')[0]);



                        if (selected === clicked) {

                            return false;

                        if (selected.dom === clicked.dom) {

                            return;

                        }



                        Ext.select('.cls-group').removeCls('selected');

                        selected.removeCls('selected');

                        clicked.addCls('selected');



                        if (clicked.hasCls('packages')) {

                        if (clicked.hasCls('by-package')) {

                            this.getTree().setLogic(Docs.view.cls.PackageLogic);

                        } else {

                            this.getTree().setLogic(Docs.view.cls.InheritanceLogic);

                        }

                    }, this, {

                        delegate: '.cls-group'

                        delegate: 'button'

                    });

                }

            },

template/app/view/cls/Tree.js

+2 −3
Original line number Diff line number Diff line
@@ -22,9 +22,8 @@ Ext.define('Docs.view.cls.Tree', { 
            dock: 'bottom',

            cls: 'cls-grouping',

            html: [

                '<div class="cls-group packages selected">By Package</div>',

                // '<div class="cls-group categories">Categories</div>',

                '<div class="cls-group hierarchy">By Inheritance</div>'

                '<button class="by-package selected">By Package</button>',

                '<button class="by-inheritance">By Inheritance</button>'

            ].join('')

        }];

template/resources/sass/viewport.scss

+2 −1
Original line number Diff line number Diff line
@@ -1171,7 +1171,7 @@ a { 
.cls-grouping {

  padding: 5px 0 2px 0;

  text-align: center;

  div {

  button {

    display: inline-block;

    color: #4d4d4d;

    font-size: 11px;
@@ -1181,6 +1181,7 @@ a { 
    padding: 1px 13px 2px 13px;

    border: 1px solid transparent;

    cursor: pointer;

    background: transparent;

    &.selected {

      color: #fff;

      border: 1px solid #727a81;