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

Move #icon method from Class to Icons. 

Not really a responsibility of the core JsDuck::Class.
parent 8c8f62ac

lib/jsduck/class.rb

+0 −11
Original line number Diff line number Diff line
@@ -206,17 +206,6 @@ 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

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

          :extends => cls[:extends],

          :private => cls[:private],

          :icon => cls.icon,

          :icon => Icons::class_icon(cls),

        }

      end

    end



    # Returns CSS class name for an icon of class

    def self.class_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 −3
Original line number Diff line number Diff line 
require 'jsduck/icons'



module JsDuck
@@ -43,7 +44,7 @@ module JsDuck 
      return {

        :name => name,

        :fullName => alias_display_name(key)+": "+name,

        :icon => cls.icon + "-redirect",

        :icon => Icons::class_icon(cls) + "-redirect",

        :url => "#!/api/" + cls.full_name,

        :meta => cls[:meta],

        :sort => 0,
@@ -54,7 +55,7 @@ module JsDuck 
      return {

        :name => cls.short_name,

        :fullName => cls.full_name,

        :icon => cls.icon,

        :icon => Icons::class_icon(cls),

        :url => "#!/api/" + cls.full_name,

        :meta => cls[:meta],

        :sort => 1,
@@ -66,7 +67,7 @@ module JsDuck 
        :name => Class.short_name(name),

        :fullName => name,

        :type => :class,

        :icon => cls.icon + "-redirect",

        :icon => Icons::class_icon(cls) + "-redirect",

        :url => "#!/api/" + cls.full_name,

        :meta => cls[:meta],

        :sort => 2,