Merge pull request #224 from yaroslavafenkin/csp-fixes

[JENKINS-74149][JENKINS-74148] Extract inline JavaScript
jenkinsci · Jan 14, 2025 · 757f769 · 757f769
2 parents e53bee1 + 3f53618
commit 757f769
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 5 deletions.
diff --git a/src/main/resources/hudson/plugins/sauce_ondemand/SauceOnDemandBuildAction/floatingBox.jelly b/src/main/resources/hudson/plugins/sauce_ondemand/SauceOnDemandBuildAction/floatingBox.jelly
@@ -46,7 +46,7 @@
                                 <font color="${job.getStatusColor()}">${job.getStatus()}</font>
                                 <j:if test="${job.hasFailureMessage()}">
                                     <div class="divider"/>
-                                    <button onclick="dropdown(this)" class="dropdown-button">Info</button>
+                                    <button class="dropdown-button">Info</button>
                                     <div class="dropdown-content">
                                         ${job.getFailureMessage()}
                                     </div>

diff --git a/src/main/resources/hudson/plugins/sauce_ondemand/SauceOnDemandProjectAction/jobMain.jelly b/src/main/resources/hudson/plugins/sauce_ondemand/SauceOnDemandProjectAction/jobMain.jelly
@@ -49,7 +49,7 @@
                                                 <font color="${job.getStatusColor()}">${job.getStatus()}</font>
                                                 <j:if test="${job.hasFailureMessage()}">
                                                     <div class="divider"/>
-                                                    <button onclick="dropdown(this)" class="dropdown-button">Info</button>
+                                                    <button class="dropdown-button">Info</button>
                                                     <div class="dropdown-content">
                                                         ${job.getFailureMessage()}
                                                     </div>

diff --git a/src/main/webapp/css/analytics.css b/src/main/webapp/css/analytics.css
@@ -9,3 +9,30 @@
 .sauce-labs-statistics > p {
   margin: 0;
 }
+
+.dropdown {
+  position: relative;
+  display: inline-block;
+}
+
+.dropdown-content {
+  display: none;
+  position: absolute;
+  background-color: #f9f9f9;
+  min-width: 160px;
+  box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
+  padding: 12px 16px;
+  z-index: 1;
+  overflow-y: scroll;
+  white-space: pre;
+}
+
+.show {
+  display: block;
+}
+
+.divider {
+  width: 5px;
+  height: auto;
+  display: inline-block;
+}
diff --git a/src/main/webapp/js/dropdown.js b/src/main/webapp/js/dropdown.js
@@ -1,5 +1,5 @@
-function dropdown(target) {
-    target.parentNode.getElementsByClassName("dropdown-content")[0].classList.toggle("show");
+function dropdown(event) {
+    event.target.parentNode.getElementsByClassName("dropdown-content")[0].classList.toggle("show");
 }
 
 // close the dropdown if the user clicks outside the button or dropdown content
@@ -14,4 +14,10 @@ window.onclick = function(event) {
       }
     }
   }
-}
+}
+
+document.addEventListener("DOMContentLoaded", () => {
+  document.querySelectorAll(".dropdown-button").forEach((button) => {
+    button.addEventListener("click", dropdown);
+  });
+});