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

Move html_renderers from TagRegistry to Render::Tags. 

Again, not generic enough functionality to keep in TagRegistry.
parent 7bac3902

lib/jsduck/format/class.rb

+2 −2
Original line number Diff line number Diff line 
require 'jsduck/tag_registry'

require 'jsduck/render/tags'



module JsDuck

  module Format
@@ -49,7 +49,7 @@ module JsDuck 
      end



      def format_tags(context)

        TagRegistry.html_renderers.each do |tag|

        Render::Tags.renderers.each do |tag|

          if context[tag.tagname]

            tag.format(context, @formatter)

          end

lib/jsduck/render/tags.rb

+13 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ module JsDuck 
      # Takes member or class hash.

      # Returns array of rendered HTML.

      def self.render(member)

        TagRegistry.html_renderers.map do |tag|

        renderers.map do |tag|

          if member[tag.tagname]

            tag.to_html(member)

          else
@@ -19,6 +19,18 @@ module JsDuck 
        end

      end



      # Returns tags for rendering HTML, sorted in the order they should

      # appear in final output. Sorting order is determined by the

      # numeric :html_position field.

      def self.renderers

        if !@renderers

          @renderers = TagRegistry.tags.find_all(&:html_position)

          @renderers.sort! {|a, b| a.html_position <=> b.html_position }

        end



        @renderers

      end



      # Renders the signatures for a class member.

      # Returns a string.

      def self.render_signature(member)

lib/jsduck/tag_registry.rb

+0 −18
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ module JsDuck 
      @patterns = {}

      @tagnames = {}

      @signatures = []

      @html_renderers = []

      @html_renderers_sorted = false

      @member_types = []

      @tags = []
@@ -57,10 +55,6 @@ module JsDuck 
          @signatures << tag.signature

        end



        if tag.html_position

          @html_renderers << tag

        end



        @tags << tag

      end

    end
@@ -102,18 +96,6 @@ module JsDuck 
      @member_type_regex = Regexp.new("(?:(" + member_type_names.join("|") + ")-)")

    end



    # Returns tags for rendering HTML, sorted in the order they should

    # appear in final output. Sorting order is determined by the

    # numeric :html_position field.

    def html_renderers

      if !@html_renderers_sorted

        @html_renderers.sort! {|a, b| a.html_position <=> b.html_position }

        @html_renderers_sorted = true

      end



      @html_renderers

    end



    #

    # Accessors for a single tag

    #