diff --git a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java index 52b49131ad..69e1e236ca 100644 --- a/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java +++ b/core/src/main/java/jenkins/model/ModelObjectWithContextMenu.java @@ -2,7 +2,6 @@ package jenkins.model; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import hudson.Functions; -import hudson.Util; import hudson.model.Action; import hudson.model.Actionable; import hudson.model.BallColor; @@ -414,7 +413,7 @@ public interface ModelObjectWithContextMenu extends ModelObject { } public MenuItem withDisplayName(String displayName) { - this.displayName = Util.escape(displayName); + this.displayName = displayName; return this; } diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly b/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly index 41770e17da..7a5f4d3b20 100644 --- a/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly +++ b/core/src/main/resources/lib/form/breadcrumb-config-outline.jelly @@ -32,6 +32,5 @@ THE SOFTWARE. - diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.css b/core/src/main/resources/lib/form/breadcrumb-config-outline/init.css deleted file mode 100644 index dc5faf8d53..0000000000 --- a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.css +++ /dev/null @@ -1,7 +0,0 @@ -A.section-anchor { - position: relative; - top: -2em; - visibility: hidden; - display: inline-block; - width: 0px; -} diff --git a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js b/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js deleted file mode 100644 index 74523e37d9..0000000000 --- a/core/src/main/resources/lib/form/breadcrumb-config-outline/init.js +++ /dev/null @@ -1,24 +0,0 @@ -Event.observe(window, "load", function () { - /** @type section.SectionNode */ - var outline = section.buildTree(); - var menu = new breadcrumbs.ContextMenu(); - $A(outline.children).each(function (e) { - var id = "section" + iota++; // TODO: use human-readable ID - var caption = e.getHTML(); - var cur = $(e.section).down("A.section-anchor"); - if (cur != null) { - id = cur.id; - caption = caption.substring(caption.indexOf("</a>") + 4); - } else { - $(e.section).insert({ - top: "#", - }); - } - menu.add("#" + id, null, caption); - }); - var inpageNav = document.getElementById("inpage-nav"); - var chevron = document.createElement("li"); - chevron.classList.add("children"); - inpageNav.parentNode.insertBefore(chevron, inpageNav.nextSibling); - breadcrumbs.attachMenu(chevron, menu); -}); diff --git a/core/src/main/resources/lib/layout/breadcrumbBar.jelly b/core/src/main/resources/lib/layout/breadcrumbBar.jelly index 9be0ca3d49..a77723e50f 100644 --- a/core/src/main/resources/lib/layout/breadcrumbBar.jelly +++ b/core/src/main/resources/lib/layout/breadcrumbBar.jelly @@ -35,8 +35,6 @@ THE SOFTWARE. ]]> - - @@ -51,7 +49,7 @@ THE SOFTWARE. hasMenu="${h.isModelWithContextMenu(anc.object)}" /> -
  • +
  • @@ -67,6 +65,4 @@ THE SOFTWARE. - -