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

Rename membersData to searchData. 

A better name.
parent 3adbd22b

lib/jsduck/app.rb

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ require 'jsduck/doc_formatter' 
require 'jsduck/class'

require 'jsduck/tree'

require 'jsduck/tree_icons'

require 'jsduck/members'

require 'jsduck/search_data'

require 'jsduck/relations'

require 'jsduck/aliases'

require 'jsduck/exporter'
@@ -107,7 +107,7 @@ module JsDuck 
        create_index_html(@template_dir, @output_dir)

        @timer.time(:generating) { write_src(@output_dir+"/source", parsed_files) }

        @timer.time(:generating) { write_tree(@output_dir+"/output/tree.js", relations) }

        @timer.time(:generating) { write_members(@output_dir+"/output/members.js", relations) }

        @timer.time(:generating) { write_search_data(@output_dir+"/output/searchData.js", relations) }

        @timer.time(:generating) { write_classes(@output_dir+"/output", relations) }

        @timer.time(:generating) { write_overview(@output_dir+"/output/overviewData.js", relations) }

        @timer.time(:generating) { @guides.write(@output_dir+"/guides") }
@@ -223,9 +223,9 @@ module JsDuck 


    # Given all classes, generates members data for search and writes in

    # in JSON form into a file.

    def write_members(filename, relations)

      members = Members.new.create(relations.classes)

      js = "Docs.membersData = " + JSON.generate( {:data => members} ) + ";"

    def write_search_data(filename, relations)

      search_data = SearchData.new.create(relations.classes)

      js = "Docs.searchData = " + JSON.generate( {:data => search_data} ) + ";"

      File.open(filename, 'w') {|f| f.write(js) }

    end

lib/jsduck/members.rb→lib/jsduck/search_data.rb

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


  # Creates list of all members in all classes that is used by the

  # searching feature in UI.

  class Members

  class SearchData

    # Given list of class documentation objects returns an array of

    # hashes describing all the members.

    def create(docs)

template/app/controller/Search.js

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ Ext.define('Docs.controller.Search', { 
        var reBeg = new RegExp("^" + safeText, "i");

        var reMid = new RegExp(safeText, "i");



        Ext.Array.forEach(Docs.membersData.data, function(r) {

        Ext.Array.forEach(Docs.searchData.data, function(r) {

            // when search text has "." in it, search from the full name (e.g. "Ext.Component.focus")

            // Otherwise search from just the member name (e.g. "focus" or "Component")

            var name = hasDot ? r.cls + (r.type === "cls" ? "" : "." + r.member) : r.member;

template/index.html

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
  <script type="text/javascript" src="app.js"></script>



  <script type="text/javascript" src="output/tree.js"></script>

  <script type="text/javascript" src="output/members.js"></script>

  <script type="text/javascript" src="output/searchData.js"></script>

  <script type="text/javascript" src="output/overviewData.js"></script>



</head>