Commit d0366e31 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge branch '4.0.1'

parents 430c5d7d 7ea3e48f
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
  s.required_rubygems_version = ">= 1.3.5"

  s.name = 'jsduck'
  s.version = '4.0.0'
  s.date = '2012-08-09'
  s.version = '4.0.1'
  s.date = '2012-08-21'
  s.summary = "Simple JavaScript Duckumentation generator"
  s.description = "Documentation generator for Sencha JS frameworks"
  s.homepage = "https://github.com/senchalabs/jsduck"
+8 −2
Original line number Diff line number Diff line
@@ -232,9 +232,15 @@ module JsDuck
      Enum.new(@classes).process_all!
    end

    # Processes all overrides
    # Processes all overrides.
    # Returns list of override classes.
    def process_overrides
      Override.new(@classes, @documentation).process_all!
      Override.new(@classes).process_all!.map do |cls|
        # discard each override class
        @classes.delete(cls[:name])
        @documentation.delete(cls)
        cls
      end
    end

    # Are we dealing with ExtJS 4?
+2 −1
Original line number Diff line number Diff line
@@ -130,7 +130,8 @@ module JsDuck
        agr.append_ext4_event_options
      end
      agr.process_enums
      agr.process_overrides
      # Ignore override classes after applying them to actual classes
      @opts.external_classes += agr.process_overrides.map {|o| o[:name] }
      agr.result
    end

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ module JsDuck
        :cfg
      elsif doc_map[:constructor]
        :method
      elsif doc_map[:param] || doc_map[:return]
        :method
      else
        code[:tagname]
      end
+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ module JsDuck
    #
    #     {:long => "something", :short => "SOM"}
    #
    # Additionally the hash can contain a :tooltip which is the text
    # to be shown when the signature bubble is hovered over in docs.
    attr_reader :signature

    # True to include all lines up to next @tag as part of this meta-tag
Loading