Merge remote-tracking branch 'origin/main' into dependabot/npm_and_ya…

…rn/bootstrap-5.3.3 # Conflicts: # pom.xml
jenkinsci · Mar 6, 2024 · fb45aad · fb45aad
2 parents fe27c7a + 9512cde
commit fb45aad
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/resources/io/jenkins/plugins/bootstrap5.jelly b/src/main/resources/io/jenkins/plugins/bootstrap5.jelly
@@ -2,7 +2,7 @@
 <!--
 Use it like <st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
 -->
-<j:jelly xmlns:j="jelly:core">
+<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler">
 
   <j:new var="h" className="hudson.Functions" />
   ${h.initPageVariables(context)}
@@ -14,9 +14,7 @@ Use it like <st:adjunct includes="io.jenkins.plugins.bootstrap5"/>
   <script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/bootstrap.min.js"/>
   <script type="text/javascript" src="${resURL}/plugin/bootstrap5-api/js/theme-support.js"/>
 
-  <script>
-    const bootstrap5 = bootstrap;
-  </script>
+  <st:adjunct includes="io.jenkins.plugins.bootstrap5.init-constant"/>
 
 </j:jelly>
 
diff --git a/src/main/resources/io/jenkins/plugins/bootstrap5/init-constant.js b/src/main/resources/io/jenkins/plugins/bootstrap5/init-constant.js
@@ -0,0 +1 @@
+const bootstrap5 = bootstrap;