Commit aaf64479 authored by Nick Poulden's avatar Nick Poulden
Browse files

Fix mixins not appearing in exported JSON

parent 5599fa4f

lib/jsduck/aggregator.rb

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ module JsDuck 


    # Merges new class-doc into old one.

    def merge_classes(old, new)

      [:extends, :xtype, :singleton, :private, :alternateClassName].each do |tag|

      [:extends, :xtype, :singleton, :private, :alternateClassName, :mixins].each do |tag|

        old[tag] = old[tag] || new[tag]

      end

      old[:doc] = old[:doc].length > 0 ? old[:doc] : new[:doc]
@@ -154,6 +154,7 @@ module JsDuck 
        :tagname => :class,

        :name => name,

        :doc => "",

        :mixins => [],

        :cfg => [],

        :property => [],

        :method => [],