Commit 6135c3e6 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Remove :mixins, :requires, :uses defaults. 

Having these default to nil is just fine.  Only when merging two classes
together, one needs to take the nils into account - so add some code for
that.
parent 44adbfae

lib/jsduck/aggregator.rb

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ module JsDuck 
      end

      # Merge arrays

      [:mixins, :alternateClassNames, :requires, :uses, :files].each do |tag|

        old[tag] = old[tag] + new[tag]

        old[tag] = (old[tag] || []) + (new[tag] || [])

      end

      # Merge hashes of arrays

      [:aliases].each do |tag|

lib/jsduck/merger.rb

+0 −3
Original line number Diff line number Diff line
@@ -34,10 +34,7 @@ module JsDuck 


    def merge_class(docs, code)

      h = do_merge(docs, code, {

        :mixins => [],

        :alternateClassNames => [],

        :requires => [],

        :uses => [],

      })



      h[:members] = []