Commit 1ac77680 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Move :params field merging to Method & Event classes.

parent 2431bf17

lib/jsduck/tag/event.rb

+5 −0
Original line number Diff line number Diff line 
require "jsduck/tag/member_tag"

require "jsduck/render/method_signature"

require "jsduck/params_merger"



module JsDuck::Tag

  class Event < MemberTag
@@ -25,6 +26,10 @@ module JsDuck::Tag 
      h[:name] = tags[0][:name]

    end



    def merge(h, docs, code)

      JsDuck::ParamsMerger.merge(h, docs, code)

    end



    def to_html(event, cls)

      JsDuck::Render::MethodSignature.render(event, cls)

    end

lib/jsduck/tag/method.rb

+5 −0
Original line number Diff line number Diff line 
require "jsduck/tag/member_tag"

require "jsduck/render/method_signature"

require "jsduck/params_merger"



module JsDuck::Tag

  # Implementation of @method tag.
@@ -41,6 +42,10 @@ module JsDuck::Tag 
      h

    end



    def merge(h, docs, code)

      JsDuck::ParamsMerger.merge(h, docs, code)

    end



    def to_html(method, cls)

      JsDuck::Render::MethodSignature.render(method, cls)

    end

lib/jsduck/tag/param.rb

+0 −6
Original line number Diff line number Diff line 
require "jsduck/tag/tag"

require "jsduck/doc/subproperties"

require "jsduck/render/subproperties"

require "jsduck/params_merger"



module JsDuck::Tag

  class Param < Tag
@@ -9,7 +8,6 @@ module JsDuck::Tag 
      @pattern = "param"

      @tagname = :params

      @repeatable = true

      @merge_context = :member

      @html_position = POS_PARAM

    end
@@ -36,10 +34,6 @@ module JsDuck::Tag 
      h[:params] = nil if h[:params].length == 0

    end



    def merge(h, docs, code)

      JsDuck::ParamsMerger.merge(h, docs, code)

    end



    def format(m, formatter)

      m[:params].each {|p| formatter.format_subproperty(p) }

    end