Merge pull request #8957 from NotMyFault/backporting-the-2nd

Second backporting for 2.440.1
jenkinsci · Feb 16, 2024 · d12b130 · d12b130
2 parents b9373bb + 4089150
commit d12b130
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.css
@@ -48,16 +48,50 @@
   display: block;
   background-color: var(--background);
   box-shadow: var(--dropdown-box-shadow);
-  transition: var(--standard-transition);
   border-radius: 15px;
   opacity: 0;
-  transform: translateY(-10px) scale(0.975);
-  z-index: 1000;
+  z-index: 0;
+  transform: scale(0);
+}
+
+.am-container.am-hidden div.am-list {
+  animation: hide-am-list 300ms ease-in 1 normal;
 }
+
 .am-container.visible div.am-list {
   opacity: 1;
-  transform: scale(1);
+  animation: show-am-list 300ms ease-in 1 normal forwards;
+  z-index: 1000;
+}
+
+@keyframes show-am-list {
+  from {
+    opacity: 0;
+    visibility: hidden;
+    transform: translateY(-10px) scale(0.975);
+  }
+  to {
+    opacity: 1;
+    visibility: visible;
+    transform: scale(1);
+  }
 }
+
+@keyframes hide-am-list {
+  from {
+    opacity: 1;
+    visibility: visible;
+    transform: scale(1);
+    z-index: 1000;
+  }
+  to {
+    opacity: 0;
+    visibility: hidden;
+    transform: translateY(-10px) scale(0.975);
+    z-index: 1000;
+  }
+}
+
 .am-container .am-message {
   display: block;
   line-height: 1.4em;

diff --git a/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.js b/core/src/main/resources/jenkins/management/AdministrativeMonitorsDecorator/resources.js
@@ -38,6 +38,7 @@
             var popupContent = responseText;
             amList.innerHTML = popupContent;
             amMonitorRoot.classList.add("visible");
+            amMonitorRoot.classList.remove("am-hidden");
             document.addEventListener("click", onClose);
             document.addEventListener("keydown", onEscClose);
 
@@ -50,6 +51,9 @@
     }
 
     function close() {
+      if (amMonitorRoot.classList.contains("visible")) {
+        amMonitorRoot.classList.add("am-hidden");
+      }
       amMonitorRoot.classList.remove("visible");
       document.removeEventListener("click", onClose);
       document.removeEventListener("keydown", onEscClose);