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

Replace cls/member/type with name/fullName in search. 

The search no more assumes we are dealing with classes and members.
We just supply the short and full name of an item, whatever it is.
parent 028e366d

lib/jsduck/search_data.rb

+8 −11
Original line number Diff line number Diff line
@@ -38,9 +38,8 @@ module JsDuck 
    # Creates structure representing one alias

    def alias_node(key, name, cls)

      return {

        :cls => alias_display_name(key)+": "+name,

        :member => name,

        :type => :class,

        :name => name,

        :fullName => alias_display_name(key)+": "+name,

        :icon => cls.icon + "-redirect",

        :url => "#!/api/" + cls.full_name,

        :meta => cls[:meta],
@@ -51,9 +50,8 @@ module JsDuck 
    # Creates structure representing one class

    def class_node(cls)

      return {

        :cls => cls.full_name,

        :member => cls.short_name,

        :type => :class,

        :name => cls.short_name,

        :fullName => cls.full_name,

        :icon => cls.icon,

        :url => "#!/api/" + cls.full_name,

        :meta => cls[:meta],
@@ -64,8 +62,8 @@ module JsDuck 
    # Creates structure representing one alternate classname

    def alt_node(name, cls)

      return {

        :cls => name,

        :member => Class.short_name(name),

        :name => Class.short_name(name),

        :fullName => name,

        :type => :class,

        :icon => cls.icon + "-redirect",

        :url => "#!/api/" + cls.full_name,
@@ -77,9 +75,8 @@ module JsDuck 
    # Creates structure representing one member

    def member_node(member, cls)

      return {

        :cls => cls.full_name,

        :member => member[:name],

        :type => :member,

        :name => member[:name],

        :fullName => cls.full_name + "." + member[:name],

        :icon => "icon-" + member[:tagname].to_s,

        :url => "#!/api/" + cls.full_name + "-" + member[:id],

        :meta => member[:meta],

template/app/ClassRegistry.js

+2 −2
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ Ext.define("Docs.ClassRegistry", { 


            // when search text has "." or ":" in it, search from the full name

            // (e.g. "Ext.Component.focus" or "xtype: grid")

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

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

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

            var name = searchFull ? r.fullName : r.name;

            // Shift private items further back

            // Shift removed items to the very end of each match category

            var shift = r["private"] ? 4 : (r["removed"] ? 8 : 0);

template/app/store/Search.js

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
Ext.define('Docs.store.Search', {

    extend: 'Ext.data.Store',



    fields: ['cls', 'member', 'type', 'icon', 'url', 'meta', 'sort'],

    fields: ['name', 'fullName', 'icon', 'url', 'meta', 'sort'],

    proxy: {

        type: 'memory',

        reader: {

template/app/view/search/Dropdown.js

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ Ext.define('Docs.view.search.Dropdown', { 
                '<div class="item">',

                    '<div class="icon {icon}"></div>',

                    '<div class="meta">{[this.getMetaTags(values.meta)]}</div>',

                    '<div class="title {[this.getCls(values.meta)]}">{member}</div>',

                    '<div class="class">{cls}</div>',

                    '<div class="title {[this.getCls(values.meta)]}">{name}</div>',

                    '<div class="class">{fullName}</div>',

                '</div>',

            '</tpl>',

            '<div class="footer">',