Loading lib/jsduck/tag/tag.rb +2 −5 Original line number Diff line number Diff line Loading @@ -70,11 +70,8 @@ module JsDuck::Tag end # In the context of which members or classes invoke the #merge # method. Possible values are: # # - :class # - :member # # method. This can be either a single tagname like :class, # :method, :cfg or an array of these. attr_reader :merge_context # Merges documentation and code hashes into the result hash. Loading lib/jsduck/tag_registry.rb +4 −3 Original line number Diff line number Diff line Loading @@ -12,7 +12,7 @@ module JsDuck @ext_define_patterns = {} @ext_define_defaults = {} @keys = {} @mergers = {:class => [], :member => []} @mergers = {} @signatures = [] @html_renderers = {:top => [], :bottom => []} @member_types = [] Loading Loading @@ -42,8 +42,9 @@ module JsDuck if tag.key @keys[tag.key] = tag end if tag.merge_context @mergers[tag.merge_context] << tag Array(tag.merge_context).each do |context| @mergers[context] = [] unless @mergers[context] @mergers[context] << tag end if tag.member_type @member_types << tag.member_type Loading Loading
lib/jsduck/tag/tag.rb +2 −5 Original line number Diff line number Diff line Loading @@ -70,11 +70,8 @@ module JsDuck::Tag end # In the context of which members or classes invoke the #merge # method. Possible values are: # # - :class # - :member # # method. This can be either a single tagname like :class, # :method, :cfg or an array of these. attr_reader :merge_context # Merges documentation and code hashes into the result hash. Loading
lib/jsduck/tag_registry.rb +4 −3 Original line number Diff line number Diff line Loading @@ -12,7 +12,7 @@ module JsDuck @ext_define_patterns = {} @ext_define_defaults = {} @keys = {} @mergers = {:class => [], :member => []} @mergers = {} @signatures = [] @html_renderers = {:top => [], :bottom => []} @member_types = [] Loading Loading @@ -42,8 +42,9 @@ module JsDuck if tag.key @keys[tag.key] = tag end if tag.merge_context @mergers[tag.merge_context] << tag Array(tag.merge_context).each do |context| @mergers[context] = [] unless @mergers[context] @mergers[context] << tag end if tag.member_type @member_types << tag.member_type Loading