Commit 061f5586 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Remove --ext4-events option. 

Instead attempt to auto-detect if we are parsing Ext4 code.
parent 802426bf

Rakefile

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ def run_jsduck(extra_options) 
    "ruby", "bin/jsduck",

    # --external=Error to ignore the Error class that Ext.Error extends.

    "--external", "Error",

    "--ext4-events",

    "--guides", "#{SDK_DIR}/guides",

    "--guides-order", "getting,class,application,layouts,data,grid,tree,drawing,forms,components,theming,direct",

    "--categories", "#{SDK_DIR}/extjs/doc-resources/categories.json",

bin/jsduck

+0 −6
Original line number Diff line number Diff line
@@ -32,12 +32,6 @@ opts = OptionParser.new do | opts | 
    app.output_dir = path

  end



  opts.on('--ext4-events',

    "Appends extra options parameter to each event that is",

    "automatically added by ExtJS 4.", " ") do

    app.ignore_global = true

  end



  opts.on('--ignore-global', "Turns off the creation of global class.", " ") do

    app.ignore_global = true

  end

lib/jsduck/aggregator.rb

+9 −0
Original line number Diff line number Diff line
@@ -147,7 +147,10 @@ module JsDuck 
    end



    # Appends Ext4 options parameter to each event parameter list.

    # But only when we are dealing with Ext4 codebase.

    def append_ext4_event_options

      return unless ext4?



      options = {

        :tagname => :param,

        :name => "options",
@@ -159,6 +162,12 @@ module JsDuck 
      end

    end



    # Are we dealing with ExtJS 4?

    # True if any of the classes is defined with Ext.define()

    def ext4?

      @documentation.any? {|cls| cls[:code_type] == :ext_define }

    end



    def result

      @documentation + @orphans

    end

lib/jsduck/app.rb

+1 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ module JsDuck 
    attr_accessor :footer

    attr_accessor :extjs_path

    attr_accessor :append_html

    attr_accessor :ext4_events



    def initialize

      @output_dir = nil
@@ -62,7 +61,6 @@ module JsDuck 
      @footer = 'Generated with <a href="https://github.com/nene/jsduck">JSDuck</a>.'

      @extjs_path = "extjs/ext-all.js"

      @append_html = ""

      @ext4_events = false

      @timer = Timer.new

      @parallel = ParallelWrap.new

    end
@@ -151,7 +149,7 @@ module JsDuck 
      end

      agr.classify_orphans

      agr.create_global_class unless @ignore_global

      agr.append_ext4_event_options if @ext4_events

      agr.append_ext4_event_options

      agr.result

    end

lib/jsduck/merger.rb

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ module JsDuck 
        :author => detect_author(doc_map),

        :docauthor => detect_docauthor(doc_map),

        :singleton => !!doc_map[:singleton],

        # Used by Aggregator to determine if we're dealing with Ext4 code

        :code_type => code[:type],

      }, doc_map)

    end