Commit 55f16664 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge :alternateClassNames inside Tag class. 

This way we can assure it always gets a default value of [].
Which is convenient as we often need to loop through the alternate
names, but checking the existance first is bordersome.
parent 6135c3e6

lib/jsduck/merger.rb

+1 −3
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ module JsDuck 
    private



    def merge_class(docs, code)

      h = do_merge(docs, code, {

        :alternateClassNames => [],

      })

      h = do_merge(docs, code)



      h[:members] = []

lib/jsduck/tag/alternate_class_names.rb

+5 −0
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ module JsDuck::Tag 
      @key = :alternateClassNames

      @ext_define_pattern = "alternateClassName"

      @ext_define_default = {:alternateClassNames => []}

      @merge_context = :class

    end



    def merge(h, docs, code)

      h[@key] = docs[@key] || code[@key] || []

    end

  end

end