From 528c638692b2a7cbd94bb504d90e6e0989de0a25 Mon Sep 17 00:00:00 2001 From: Rene Saarsoo Date: Sun, 9 Oct 2011 00:27:04 +0300 Subject: [PATCH] Display all types of aliases in class header. Also allow more then one dot (".") in the name of an alias. --- lib/jsduck/merger.rb | 2 +- template/app/view/cls/Header.js | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/jsduck/merger.rb b/lib/jsduck/merger.rb index f32f0d96..4e1ab70a 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 3c0fc0dc..8f3c28f1 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) { -- GitLab