Merge pull request #9014 from krisstern/feat/stable-2.440/backporting…

…-2.440.2-1 Backporting for LTS 2.440.2
jenkinsci · Mar 7, 2024 · c43a863 · c43a863
2 parents 3bfef8d + 57ab550
commit c43a863
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly b/core/src/main/resources/hudson/model/Job/buildTimeTrend.jelly
@@ -38,6 +38,13 @@ THE SOFTWARE.
         <l:icon src="symbol-status-nobuilt" id="nobuilt" />
         <l:icon src="symbol-status-aborted" id="aborted" />
         <l:icon src="symbol-status-disabled" id="disabled" />
+
+        <l:icon src="symbol-status-blue-anime" id="blue-anime" />
+        <l:icon src="symbol-status-yellow-anime" id="yellow-anime" />
+        <l:icon src="symbol-status-red-anime" id="red-anime" />
+        <l:icon src="symbol-status-nobuilt-anime" id="nobuilt-anime" />
+        <l:icon src="symbol-status-aborted-anime" id="aborted-anime" />
+        <l:icon src="symbol-status-disabled-anime" id="disabled-anime" />
       </template>
       <h1>${%Build Time Trend}</h1>
           <div align="center">

diff --git a/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js b/core/src/main/resources/hudson/model/Job/buildTimeTrend_resources.js
@@ -69,7 +69,6 @@ window.buildTimeTrend_displayBuilds = function (data) {
  */
 function generateSVGIcon(iconName) {
   const icons = document.querySelector("#jenkins-build-status-icons");
-  iconName = iconName.replace("-anime", "");
 
   return icons.content.querySelector(`#${iconName}`).cloneNode(true);
 }

diff --git a/core/src/main/resources/lib/hudson/buildListTable.jelly b/core/src/main/resources/lib/hudson/buildListTable.jelly
@@ -37,6 +37,12 @@ THE SOFTWARE.
     <l:icon src="symbol-status-nobuilt" id="nobuilt" />
     <l:icon src="symbol-status-aborted" id="aborted" />
     <l:icon src="symbol-status-disabled" id="disabled" />
+    <l:icon src="symbol-status-blue-anime" id="blue-anime" />
+    <l:icon src="symbol-status-yellow-anime" id="yellow-anime" />
+    <l:icon src="symbol-status-red-anime" id="red-anime" />
+    <l:icon src="symbol-status-nobuilt-anime" id="nobuilt-anime" />
+    <l:icon src="symbol-status-aborted-anime" id="aborted-anime" />
+    <l:icon src="symbol-status-disabled-anime" id="disabled-anime" />
     <l:icon src="symbol-terminal" id="console" />
   </template>
 

diff --git a/pom.xml b/pom.xml
@@ -102,7 +102,7 @@ THE SOFTWARE.
     <bridge-method-injector.version>1.29</bridge-method-injector.version>
     <spotless.check.skip>false</spotless.check.skip>
     <!-- Make sure to keep the jetty-maven-plugin version in war/pom.xml in sync with the Jetty release in Winstone: -->
-    <winstone.version>6.16</winstone.version>
+    <winstone.version>6.18</winstone.version>
   </properties>
 
   <!--

diff --git a/war/pom.xml b/war/pom.xml
@@ -628,7 +628,7 @@ THE SOFTWARE.
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>10.0.18</version>
+        <version>10.0.20</version>
         <configuration>
           <!--
             Reload webapp when you hit ENTER. (See JETTY-282 for more)

diff --git a/war/src/main/js/components/tooltips/index.js b/war/src/main/js/components/tooltips/index.js
@@ -19,16 +19,18 @@ function registerTooltip(element) {
     element._tippy.destroy();
   }
 
+  const tooltip = element.getAttribute("tooltip");
+  const htmlTooltip = element.getAttribute("data-html-tooltip");
   if (
-    element.hasAttribute("tooltip") &&
-    !element.hasAttribute("data-html-tooltip")
+    tooltip !== null &&
+    tooltip.trim().length > 0 &&
+    (htmlTooltip === null || htmlTooltip.trim().length == 0)
   ) {
     tippy(
       element,
       Object.assign(
         {
-          content: (element) =>
-            element.getAttribute("tooltip").replace(/<br[ /]?\/?>|\\n/g, "\n"),
+          content: () => tooltip.replace(/<br[ /]?\/?>|\\n/g, "\n"),
           onCreate(instance) {
             instance.reference.setAttribute("title", instance.props.content);
           },
@@ -44,12 +46,12 @@ function registerTooltip(element) {
     );
   }
 
-  if (element.hasAttribute("data-html-tooltip")) {
+  if (htmlTooltip !== null && htmlTooltip.trim().length > 0) {
     tippy(
       element,
       Object.assign(
         {
-          content: (element) => element.getAttribute("data-html-tooltip"),
+          content: () => htmlTooltip,
           allowHTML: true,
           onCreate(instance) {
             instance.props.interactive =