Merge branch 'master' into ServletException

Author: krisstern

core/src/main/resources/jenkins/model/Jenkins/configure.jelly

@@ -29,7 +29,7 @@ THE SOFTWARE.
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 <l:layout permissions="${app.MANAGE_AND_SYSTEM_READ}" title="${%System}" type="one-column">
   <st:include page="sidepanel.jelly" />
-  <l:breadcrumb title="${%System}" />
+  <f:breadcrumb-config-outline title="${%System}" />
 
   <l:main-panel>
     <j:set var="readOnlyMode" value="${!h.hasPermission(app.MANAGE)}"/>

core/src/main/resources/lib/form/breadcrumb-config-outline.jelly

@@ -32,5 +32,5 @@ THE SOFTWARE.
     </st:attribute>
   </st:documentation>
 
-  <l:breadcrumb title="${attrs.title?:'%configuration'}" id="inpage-nav" />
+  <l:breadcrumb title="${attrs.title?:'%configuration'}" id="inpage-nav" hasMenu="true" />
 </j:jelly>

core/src/main/resources/lib/layout/breadcrumb.jelly

@@ -48,10 +48,10 @@ THE SOFTWARE.
 
   <j:if test="${mode=='breadcrumbs'}">
     <j:set var="hasLink" value="${attrs.href != null}" />
-    <li id="${attrs.id}" class="jenkins-breadcrumbs__list-item" data-type="breadcrumb-item" aria-current="${hasLink ? null : 'page'}">
+    <li id="${attrs.id}" class="jenkins-breadcrumbs__list-item" data-type="breadcrumb-item" aria-current="${hasLink ? null : 'page'}" data-has-menu="${attrs.hasMenu}">
       <j:choose>
         <j:when test="${!hasLink}">
-          <span>${attrs.title}</span>
+          <span class="${attrs.hasMenu ? 'hoverable-model-link' : ''}">${attrs.title}</span>
         </j:when>
         <j:otherwise>
           <a href="${attrs.href}" class="${attrs.hasMenu ? 'hoverable-model-link' : ''} ${attrs.hasChildrenMenu ? 'hoverable-children-model-link' : ''}">

src/main/js/components/dropdowns/autocomplete.js

@@ -93,7 +93,6 @@ function init() {
     0,
     function (e) {
       e.setAttribute("autocomplete", "off");
-      e.dataset["hideOnClick"] = "false";
       // form field with auto-completion support
       e.style.position = "relative";
       // otherwise menu won't hide on tab with nothing selected

src/main/js/components/dropdowns/inpage-jumplist.js

@@ -5,21 +5,17 @@ import { toId } from "@/util/dom";
  * sections on the page (if using <f:breadcrumb-config-outline />)
  */
 function init() {
-  const inpageNavigationBreadcrumb = document.querySelector("#inpage-nav");
+  const inpageNavigationBreadcrumb = document.querySelector("#inpage-nav span");
 
   if (inpageNavigationBreadcrumb) {
-    const chevron = document.createElement("li");
-    chevron.classList.add("children");
-    chevron.items = Array.from(
+    inpageNavigationBreadcrumb.items = Array.from(
       document.querySelectorAll(
         "form > div > .jenkins-section > .jenkins-section__title",
       ),
     ).map((section) => {
       section.id = toId(section.textContent);
       return { label: section.textContent, url: "#" + section.id };
     });
-
-    inpageNavigationBreadcrumb.after(chevron);
   }
 }
 

src/main/js/components/dropdowns/jumplists.js

@@ -38,13 +38,13 @@ function generateDropdowns() {
       Utils.generateDropdown(
         element,
         (instance) => {
-          const href = element.href;
-
           if (element.items) {
             instance.setContent(Utils.generateDropdownItems(element.items));
             return;
           }
 
+          const href = element.href;
+
           const hasModelLink = element.classList.contains(
             "hoverable-model-link",
           );
@@ -105,7 +105,7 @@ function generateDropdowns() {
               instance.loaded = true;
             });
         },
-        false,
+        element.items != null,
         {
           trigger: "mouseenter",
           offset: [-16, 10],

src/main/js/components/dropdowns/utils.js

@@ -22,43 +22,25 @@ function generateDropdown(element, callback, immediate, options = {}) {
       {},
       Templates.dropdown(),
       {
-        hideOnClick:
-          element.dataset["hideOnClick"] !== "false" ? "toggle" : false,
         onCreate(instance) {
           const onload = () => {
             if (instance.loaded) {
               return;
             }
 
             document.addEventListener("click", (event) => {
-              const isClickInAnyDropdown =
-                !!event.target.closest("[data-tippy-root]");
               const isClickOnReference = instance.reference.contains(
                 event.target,
               );
+              // Don't close the dropdown if the user is interacting with a SELECT menu inside of it
+              const isSelect = event.target.tagName === "SELECT";
 
-              if (!isClickInAnyDropdown && !isClickOnReference) {
+              if (!isClickOnReference && !isSelect) {
+                instance.clickToHide = true;
                 instance.hide();
               }
             });
 
-            instance.popper.addEventListener("mouseenter", () => {
-              const handleMouseMove = () => {
-                const dropdowns =
-                  document.querySelectorAll("[data-tippy-root]");
-                const isMouseOverAnyDropdown = Array.from(dropdowns).some(
-                  (dropdown) => dropdown.matches(":hover"),
-                );
-
-                if (!isMouseOverAnyDropdown) {
-                  instance.hide();
-                  document.removeEventListener("mousemove", handleMouseMove);
-                }
-              };
-
-              document.addEventListener("mousemove", handleMouseMove);
-            });
-
             callback(instance);
           };
           if (immediate) {
@@ -69,13 +51,21 @@ function generateDropdown(element, callback, immediate, options = {}) {
             });
           }
         },
-        onHide() {
-          const dropdowns = document.querySelectorAll("[data-tippy-root]");
-          const isMouseOverAnyDropdown = Array.from(dropdowns).some(
-            (dropdown) => dropdown.matches(":hover"),
-          );
+        onHide(instance) {
+          if (
+            instance.props.trigger === "mouseenter" &&
+            !instance.clickToHide
+          ) {
+            const dropdowns = document.querySelectorAll("[data-tippy-root]");
+            const isMouseOverAnyDropdown = Array.from(dropdowns).some(
+              (dropdown) => dropdown.matches(":hover"),
+            );
+
+            return !isMouseOverAnyDropdown;
+          }
 
-          return !isMouseOverAnyDropdown;
+          instance.clickToHide = false;
+          return true;
         },
       },
       options,

src/main/js/util/jenkins.js

@@ -10,11 +10,7 @@ var jenkins = {};
 
 // gets the base Jenkins URL including context path
 jenkins.baseUrl = function () {
-  var u = $("head").attr("data-rooturl");
-  if (!u) {
-    u = "";
-  }
-  return u;
+  return document.head.dataset.rooturl;
 };
 
 /**

src/main/scss/base/_core.scss

@@ -3,6 +3,7 @@ html {
   box-sizing: border-box;
   -webkit-tap-highlight-color: transparent;
   color: var(--text-color);
+  scroll-padding-top: calc(var(--header-height) + var(--section-padding));
 }
 
 body {