diff --git a/lib/jsduck/merger.rb b/lib/jsduck/merger.rb index f32f0d96f346b21a5f2b1cd4bd3b06a9b455369c..4e1ab70a355497cbb92390e3a65eade29a8416db 100644 --- a/lib/jsduck/merger.rb +++ b/lib/jsduck/merger.rb @@ -330,7 +330,7 @@ module JsDuck end end (code[:alias] || []).each do |a| - if a =~ /^(\w+)\.(\w+)$/ + if a =~ /^([\w.]+)\.(\w+)$/ if xtypes[$1] xtypes[$1] << $2 else diff --git a/template/app/view/cls/Header.js b/template/app/view/cls/Header.js index 3c0fc0dc0ffca671834572870dc3655f7d7e49b5..8f3c28f13b136686e6def070bd4ea6a64ff3f504 100644 --- a/template/app/view/cls/Header.js +++ b/template/app/view/cls/Header.js @@ -33,16 +33,14 @@ Ext.define('Docs.view.cls.Header', { } }, renderXTypes: function(xtypes) { - var map = { + var titles = { widget: "xtype", plugin: "ptype", feature: "ftype" }; var r = []; - xtypes && Ext.Object.each(map, function(ns, title) { - if (xtypes[ns]) { - r.push(title + ": " + xtypes[ns].join(", ")); - } + xtypes && Ext.Object.each(xtypes, function(ns, types) { + r.push((titles[ns] || ns) + ": " + types.join(", ")); }); if (r.length > 0) {