From 30b6187f1532a5e499b7817cc58156fb216b597c Mon Sep 17 00:00:00 2001 From: Gilles Dubochet Date: Wed, 23 Feb 2011 19:54:45 +0000 Subject: [scaladoc] The "inherited" filter work correctl... [scaladoc] The "inherited" filter work correctly for inner classes and object. Closes #3775. No review. --- src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js index c1bb1dab87..ef98c13aaf 100644 --- a/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js +++ b/src/compiler/scala/tools/nsc/doc/html/resource/lib/template.js @@ -243,8 +243,10 @@ function filter() { //var name1 = qualName1.slice(qualName1.indexOf("#") + 1); var showByOwned = true; if ($(this).parents(".parent").length == 0) { - // owner filtering must not happen in "inherited from" member lists - var owner1 = qualName1.slice(0, qualName1.indexOf("#")); + // owner filtering must not happen in "inherited from" member lists + var ownerIndex = qualName1.indexOf("#"); + if (ownerIndex < 0) { ownerIndex = qualName1.lastIndexOf("."); } + var owner1 = qualName1.slice(0, ownerIndex); for (out in outOwners) { if (outOwners[out] == owner1) { showByOwned = false; -- cgit v1.2.3