Merge pull request #274 from jenkinsci/remove-prototype-workaround

Remove the obsolete Prototype.js workaround
jenkinsci · Feb 20, 2024 · e3e1b2f · e3e1b2f
2 parents 63f5b85 + 2328224
commit e3e1b2f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 21 deletions.
diff --git a/src/main/resources/io/jenkins/plugins/bootstrap5.jelly b/src/main/resources/io/jenkins/plugins/bootstrap5.jelly
@@ -2,19 +2,16 @@
 <!--
 Use it like <st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
 -->
-<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
+<j:jelly xmlns:j="jelly:core">
 
   <j:new var="h" className="hudson.Functions" />
   ${h.initPageVariables(context)}
 
-  <st:adjunct includes="io.jenkins.plugins.jquery3"/> <!-- FIXME: no-prototype.js depends on JQuery -->
-
   <link type="text/css" rel="stylesheet" href="${resURL}/plugin/bootstrap5-api/css/bootstrap-custom-build.css"/>
   <link type="text/css" rel="stylesheet" href="${resURL}/plugin/bootstrap5-api/css/jenkins-style.css"/>
 
   <script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/popper.min.js"/>
   <script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/bootstrap.min.js"/>
-  <script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/no-prototype.js"/>
   <script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/theme-support.js"/>
 
   <script>

diff --git a/src/main/webapp/js/no-prototype.js b/src/main/webapp/js/no-prototype.js