Skip to content

Commit 3550a6d

Browse files
committed
Group documentableItem elements & adjust event listener
1 parent b3cfa3f commit 3550a6d

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

scaladoc/resources/dotty_res/scripts/ux.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ window.addEventListener("DOMContentLoaded", () => {
1010
var elements = document.getElementsByClassName("documentableElement")
1111
if (elements) {
1212
for (i = 0; i < elements.length; i++) {
13-
if (elements[i].querySelector(".show-content") !== null) {
14-
elements[i].onclick = function (e) {
13+
var expanderChild = elements[i].querySelector(".documentableElement-expander")
14+
if (elements[i].querySelector(".show-content") !== null && expanderChild !== null) {
15+
expanderChild.onclick = function (e) {
1516
if (!$(e.target).is("a") && e.fromSnippet !== true) {
16-
this.classList.toggle("expand")
17+
this.parentElement.classList.toggle("expand")
1718
this.querySelector(".show-content").classList.toggle("expand")
1819
}
1920
}

scaladoc/src/dotty/tools/scaladoc/renderers/MemberRenderer.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,11 @@ class MemberRenderer(signatureRenderer: SignatureRenderer)(using DocContext) ext
184184
val annots = annotations(member)
185185

186186
div(topLevelAttr:_*)(
187-
Option.when(annots.nonEmpty || originInf.nonEmpty || memberInf.nonEmpty)(button(cls := "icon-button show-content")).toList,
188-
annots.map(div(_)).toList,
189-
div(cls := "header monospace")(memberSignature(member)),
187+
div(cls := "documentableElement-expander")(
188+
Option.when(annots.nonEmpty || originInf.nonEmpty || memberInf.nonEmpty)(button(cls := "icon-button show-content")).toList,
189+
annots.map(div(_)).toList,
190+
div(cls := "header monospace")(memberSignature(member)),
191+
),
190192
Option.when(originInf.nonEmpty || memberInf.nonEmpty)(
191193
div(cls := "docs")(
192194
span(cls := "modifiers"), // just to have padding on left

0 commit comments

Comments
 (0)