Skip to content

Commit 91132f4

Browse files
authored
Merge branch 'master' into matcher
2 parents bd59b54 + 3a97ed4 commit 91132f4

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

src/main/js/components/dropdowns/templates.js

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,21 @@ function dropdown() {
3636
animation: "dropdown",
3737
duration: 250,
3838
onShow: (instance) => {
39-
// Make sure only one instance is visible at all times
40-
const dropdowns = document.querySelectorAll("[data-tippy-root]");
41-
Array.from(dropdowns).forEach((element) => {
42-
// Check if the Tippy.js instance exists
43-
if (element && element._tippy) {
44-
// To just hide the dropdown
45-
element._tippy.hide();
46-
}
47-
});
39+
// Make sure only one instance is visible at all times in case of breadcrumb
40+
if (
41+
instance.reference.classList.contains("hoverable-model-link") ||
42+
instance.reference.classList.contains("hoverable-children-model-link")
43+
) {
44+
const dropdowns = document.querySelectorAll("[data-tippy-root]");
45+
Array.from(dropdowns).forEach((element) => {
46+
// Check if the Tippy.js instance exists
47+
if (element && element._tippy) {
48+
// To just hide the dropdown
49+
element._tippy.hide();
50+
}
51+
});
52+
}
53+
4854
const referenceParent = instance.reference.parentNode;
4955

5056
if (referenceParent.classList.contains("model-link")) {

test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ THE SOFTWARE.
223223
<dependency>
224224
<groupId>org.jenkins-ci.plugins</groupId>
225225
<artifactId>cloudbees-folder</artifactId>
226-
<version>6.1035.v059a_a_f946868</version>
226+
<version>6.1036.vb_94fd035b_287</version>
227227
<scope>test</scope>
228228
</dependency>
229229
<dependency>

0 commit comments

Comments
 (0)