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

Merge branch 'master' into esprima-parser

parents 5871ad40 c641783f

Rakefile

+2 −5
Original line number Diff line number Diff line
@@ -220,7 +220,6 @@ task :ext4 => :sass do 
  runner = JsDuckRunner.new

  runner.add_ext4

  runner.add_debug

  runner.add_options("--tests")

  runner.run



  system("cp -r #{EXT_BUILD} #{OUT_DIR}/extjs-build")
@@ -239,8 +238,7 @@ task :sdk => :sass do 
    "--import", "Ext JS 4.0.7:compare/ext407",

    "--import", "Ext JS 4.1.0:compare/ext410",

    "--import", "Ext JS 4.1.1",

    "--seo",

    "--tests"

    "--seo"

  )

  runner.add_debug

  runner.add_comments('ext-js', '4')
@@ -256,8 +254,7 @@ task :touch2 => :sass do 
    "--output", OUT_DIR,

    "--config", "#{SDK_DIR}/touch/docs/config.json",

    "--examples-base-url", "touch-build/examples/production/",

    "--seo",

    "--tests"

    "--seo"

  )



  runner.add_debug

js-classes/String.js

+1 −1
Original line number Diff line number Diff line
@@ -949,7 +949,7 @@ 
 *

 * The following example displays the string "sencha":

 *

 *     var upperText="sencha";

 *     var upperText="SENCHA";

 *     document.write(upperText.toLocaleLowerCase());

 *

 * @return {String} Returns value of the string in lowercase.

lib/jsduck/aggregator.rb

+0 −3
Original line number Diff line number Diff line
@@ -206,10 +206,7 @@ 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 => "eOpts",

lib/jsduck/app.rb

+3 −1
Original line number Diff line number Diff line
@@ -126,7 +126,9 @@ module JsDuck 
      agr.create_global_class

      agr.remove_ignored_classes

      agr.create_accessors

      if @opts.ext4_events == true || (@opts.ext4_events == nil && agr.ext4?)

        agr.append_ext4_event_options

      end

      agr.process_enums

      agr.result

    end

lib/jsduck/options.rb

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ module JsDuck 
    attr_accessor :output_dir

    attr_accessor :ignore_global

    attr_accessor :external_classes

    attr_accessor :ext4_events



    # Customizing output

    attr_accessor :title
@@ -74,6 +75,7 @@ module JsDuck 
        # Special anything-goes type

        "Mixed",

      ]

      @ext4_events = nil

      @meta_tag_paths = []



      @version = "4.0.beta2"
@@ -159,6 +161,14 @@ module JsDuck 
          @external_classes += classes

        end



        opts.on('--[no-]ext4-events',

          "Appends extra options parameter that all Ext events have.",

          "The default is to auto-detect if we're using Ext JS 4",

          "based on whether the code uses Ext.define.",

          "Use this option to override the auto-detection.", " ") do |e|

          @ext4_events = e

        end



        opts.on('--builtin-classes',

          "Includes docs for JavaScript builtin classes.", " ") do

          read_filenames(@root_dir + "/js-classes")