Commit 9c876fc9 authored by Rene Saarsoo's avatar Rene Saarsoo
Browse files

Merge branch 'master' into doc-tags

parents c4bebcff 43bcbaec

Rakefile

+4 −0
Original line number Diff line number Diff line
@@ -275,6 +275,10 @@ task :touch2 => :sass do 
    "--output", OUT_DIR,

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

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

    # "--import", "Touch 1.1:../docs.sencha.com/exports/touch-1.1",

    # "--import", "Touch 2.0:../docs.sencha.com/exports/touch-2.0.1",

    # "--import", "Touch 2.1.0:../docs.sencha.com/exports/touch-2.1.0",

    # "--import", "Touch 2.1.1",

    "--seo"

  )

js-classes/RegExp.js

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

 * |                  | `/\d+(?!\.)/.exec("3.141")` matches 141 but not 3.141.

 * |                  |

 * | `x|y`            | Matches either `x` or `y`.

 * |<code>x&#124;y</code>| Matches either `x` or `y`.

 * |                  |

 * |                  | For example, `/green|red/` matches 'green' in "green apple" and 'red' in "red apple."

 * |                  |

lib/jsduck/class.rb

+2 −2
Original line number Diff line number Diff line
@@ -152,9 +152,9 @@ module JsDuck 
        ms = @members_index.global_by_name[query[:name]] || []

        ms = ms.find_all {|m| m[:owner] == @doc[:name]} if query[:local]

      elsif query[:local]

        ms = @members_index.local_by_id.values

        ms = @members_index.all_local

      else

        ms = @members_index.global_by_id.values

        ms = @members_index.all_global

      end



      if query[:tagname]

lib/jsduck/members_index.rb

+24 −12
Original line number Diff line number Diff line
@@ -31,6 +31,30 @@ module JsDuck 
      @global_map_by_name

    end



    # Returns array of all members (including inherited ones)

    def all_global

      global_by_id.values

    end



    # Returns array of all local members (excludes inherited ones)

    def all_local

      local_by_id.values.reject {|m| m[:hide] }

    end



    # Clears the search cache.

    # Using this is REALLY BAD - try to get rid of it.

    def invalidate!

      @map_by_id = nil

      @global_map_by_id = nil

      @global_map_by_name = nil



      @cls.parent.members_index.invalidate! if @cls.parent



      @cls.mixins.each {|mix| mix.members_index.invalidate! }

    end



    protected



    # Returns hash of all members by ID (including inherited ones)

    def global_by_id

      unless @global_map_by_id
@@ -64,18 +88,6 @@ module JsDuck 
      @map_by_id

    end



    # Clears the search cache.

    # Using this is REALLY BAD - try to get rid of it.

    def invalidate!

      @map_by_id = nil

      @global_map_by_id = nil

      @global_map_by_name = nil



      @cls.parent.members_index.invalidate! if @cls.parent



      @cls.mixins.each {|mix| mix.members_index.invalidate! }

    end



    private



    # merges second members hash into first one