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

Refactor CSS icon class creation to JsDuck::Class

parent bf56f2a8

lib/jsduck/class.rb

+11 −0
Original line number Diff line number Diff line
@@ -285,6 +285,17 @@ module JsDuck 
      Class.short_name(@doc[:name])

    end



    # Returns CSS icons class for the class

    def icon

      if @doc[:singleton]

        "icon-singleton"

      elsif inherits_from?("Ext.Component")

        "icon-component"

      else

        "icon-class"

      end

    end



    # Static methods



    # Utility method that given a package or class name finds the name

lib/jsduck/icons.rb

+1 −11
Original line number Diff line number Diff line
@@ -9,20 +9,10 @@ module JsDuck 
          :name => cls[:name],

          :extends => cls[:extends],

          :private => cls[:private],

          :icon => icon(cls),

          :icon => cls.icon,

        }

      end

    end



    def icon(cls)

      if cls[:singleton]

        "icon-singleton"

      elsif cls.inherits_from?("Ext.Component")

        "icon-component"

      else

        "icon-class"

      end

    end

  end



end

lib/jsduck/search_data.rb

+4 −14
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ module JsDuck 
        :cls => alias_display_name(key)+": "+name,

        :member => name,

        :type => :class,

        :icon => icon(cls),

        :icon => cls.icon,

        :id => cls.full_name,

        :meta => cls[:meta],

        :sort => 0,
@@ -54,7 +54,7 @@ module JsDuck 
        :cls => cls.full_name,

        :member => cls.short_name,

        :type => :class,

        :icon => icon(cls),

        :icon => cls.icon,

        :id => cls.full_name,

        :meta => cls[:meta],

        :sort => 1,
@@ -67,7 +67,7 @@ module JsDuck 
        :cls => name,

        :member => Class.short_name(name),

        :type => :class,

        :icon => icon(cls),

        :icon => cls.icon,

        :id => cls.full_name,

        :meta => cls[:meta],

        :sort => 2,
@@ -80,23 +80,13 @@ module JsDuck 
        :cls => cls.full_name,

        :member => member[:name],

        :type => :member,

        :icon => member[:tagname],

        :icon => "icon-" + member[:tagname].to_s,

        :id => cls.full_name + "-" + member[:id],

        :meta => member[:meta],

        :sort => 3,

      }

    end



    def icon(cls)

      if cls[:singleton]

        "singleton"

      elsif cls.inherits_from?("Ext.Component")

        "component"

      else

        "class"

      end

    end



    # Some alias types are shown differently.

    # e.g. instead of "widget:" we show "xtype:"

    def alias_display_name(key)

template/app/view/search/Dropdown.js

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Ext.define('Docs.view.search.Dropdown', { 
        this.tpl = new Ext.XTemplate(

            '<tpl for=".">',

                '<div class="item">',

                    '<div class="icon icon-{icon}"></div>',

                    '<div class="icon {icon}"></div>',

                    '<div class="meta">{[this.getMetaTags(values.meta)]}</div>',

                    '<div class="title {[this.getCls(values.meta)]}">{member}</div>',

                    '<div class="class">{cls}</div>',