diff options
author | Felix Mulder <felix.mulder@gmail.com> | 2017-02-13 16:21:13 +0100 |
---|---|---|
committer | Felix Mulder <felix.mulder@gmail.com> | 2017-02-22 21:30:20 +0100 |
commit | 859aca9616aaeebf918c642da4610669b3c00b2d (patch) | |
tree | df1a4608bc929b2ac5abcae47f72ffeeb8e7df75 /doc-tool | |
parent | 43612f97cca568e0d48f44aad80d203d452d258e (diff) | |
download | dotty-859aca9616aaeebf918c642da4610669b3c00b2d.tar.gz dotty-859aca9616aaeebf918c642da4610669b3c00b2d.tar.bz2 dotty-859aca9616aaeebf918c642da4610669b3c00b2d.zip |
Fix hiding of `[+]` (find issue nbr)
Diffstat (limited to 'doc-tool')
4 files changed, 17 insertions, 1 deletions
diff --git a/doc-tool/resources/_layouts/api-page.html b/doc-tool/resources/_layouts/api-page.html index 26a4290da..878ec8d8f 100644 --- a/doc-tool/resources/_layouts/api-page.html +++ b/doc-tool/resources/_layouts/api-page.html @@ -95,7 +95,7 @@ extraCSS: {% for member in entity.members %} <div id="{{ member.signature }}" class="member {% if member.isPrivate %}private{% elsif member.isProtected %}protected{% endif %}"> <div class="member-title"> - <span class="expand-button" onclick="toggleMemberBody(this, '{{ member.signature }}');">[+]</span> + <span class="expand-button {% if member.hasShortenedDocstring == false %}invisible{% endif %}" onclick="toggleMemberBody(this, '{{ member.signature }}');">[+]</span> <span class="member-annotations"> {% for annot in member.annotations %}@{{ annot | split: '.' | last }} {% endfor %} </span> diff --git a/doc-tool/resources/css/api-page.css b/doc-tool/resources/css/api-page.css index 380efb834..1dd4f559c 100644 --- a/doc-tool/resources/css/api-page.css +++ b/doc-tool/resources/css/api-page.css @@ -122,6 +122,11 @@ div.entity-section > div.member > div.member-title > span.expand-button:hover { user-select: none; } +div.entity-section > div.member > div.member-title > span.expand-button.invisible, +div.entity-section > div.member > div.member-title > span.expand-button.invisible:hover { + color: transparent; +} + div.entity-section > div.member > div.member-body { margin: 5px 0 0 39px; } diff --git a/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala index e7cf54a03..239656141 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/JavaConverters.scala @@ -55,6 +55,7 @@ object JavaConverters { "comment" -> ent.comment.map(_.asJava).asJava, "superTypes" -> ent.superTypes, "hasVisibleMembers" -> ent.hasVisibleMembers, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "signature" -> ent.signature ) ++ extras).asJava } @@ -74,6 +75,7 @@ object JavaConverters { "isPrivate" -> ent.isPrivate, "isProtected" -> ent.isProtected, "hasVisibleMembers" -> ent.hasVisibleMembers, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "hasCompanion" -> ent.hasCompanion, "companionPath" -> ent.companionPath.asJava, "signature" -> ent.signature @@ -95,6 +97,7 @@ object JavaConverters { "isPrivate" -> ent.isPrivate, "isProtected" -> ent.isProtected, "hasVisibleMembers" -> ent.hasVisibleMembers, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "hasCompanion" -> ent.hasCompanion, "companionPath" -> ent.companionPath.asJava, "signature" -> ent.signature @@ -115,6 +118,7 @@ object JavaConverters { "isPrivate" -> ent.isPrivate, "isProtected" -> ent.isProtected, "hasVisibleMembers" -> ent.hasVisibleMembers, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "hasCompanion" -> ent.hasCompanion, "companionPath" -> ent.companionPath.asJava, "signature" -> ent.signature @@ -134,6 +138,7 @@ object JavaConverters { "isPrivate" -> ent.isPrivate, "isProtected" -> ent.isProtected, "hasVisibleMembers" -> ent.hasVisibleMembers, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "hasCompanion" -> ent.hasCompanion, "companionPath" -> ent.companionPath.asJava, "signature" -> ent.signature @@ -152,6 +157,7 @@ object JavaConverters { "paramLists" -> ent.paramLists.map(_.asJava).asJava, "comment" -> ent.comment.map(_.asJava).asJava, "implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "isPrivate" -> ent.isPrivate, "isProtected" -> ent.isProtected, "signature" -> ent.signature @@ -168,6 +174,7 @@ object JavaConverters { "returnValue" -> ent.returnValue.asJava, "comment" -> ent.comment.map(_.asJava).asJava, "implicitlyAddedFrom" -> ent.implicitlyAddedFrom.map(_.asJava).asJava, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "isPrivate" -> ent.isPrivate, "isProtected" -> ent.isProtected, "signature" -> ent.signature @@ -183,6 +190,7 @@ object JavaConverters { "path" -> ent.path.asJava, "alias" -> ent.alias.map(_.asJava).asJava, "comment" -> ent.comment.map(_.asJava).asJava, + "hasShortenedDocstring" -> ent.hasShortenedDocstring, "isPrivate" -> ent.isPrivate, "isProtected" -> ent.isProtected, "signature" -> ent.signature diff --git a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala index 9cbd1f6c8..d35077816 100644 --- a/doc-tool/src/dotty/tools/dottydoc/model/entities.scala +++ b/doc-tool/src/dotty/tools/dottydoc/model/entities.scala @@ -21,6 +21,9 @@ trait Entity { entity => def annotations: List[String] + def hasShortenedDocstring: Boolean = + comment.map(d => d.body.length > d.short.length).getOrElse(false) + def signature: String = entity.name + (entity match { case o: Object => "$" |