Merge branch 'master' into JENKINS-74806

jenkinsci · Nov 8, 2024 · 8262195 · 8262195
2 parents 36357d1 + f2ceaf6
commit 8262195
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 25 deletions.
diff --git a/.../au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly b/.../au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly
@@ -2,16 +2,5 @@
 <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" xmlns:i="jelly:fmt">
     <st:include page="bpp.jelly" from="${it.getBuildPipelineView()}" />
     <link href="${rootURL}/plugin/build-pipeline-plugin/css/main_dashboard.css" type="text/css" rel="stylesheet" />
-    <script type="text/javascript">
-        // show/hide build details
-        jQuery(document).ready(function() {
-            jQuery(".header").click(function() {
-                var parent = jQuery(this).parent();
-                var ba = parent.find(".build-actions");
-                var bb = parent.find(".build-body");
-
-                ba.add(bb).toggle('slow');
-            });
-        });
-    </script>
+    <st:adjunct includes="au.com.centrumsystems.hudson.plugin.buildpipeline.BuildPipelineView.toggle-build-details" />
 </j:jelly>
diff --git a/.../com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/toggle-build-details.js b/.../com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/toggle-build-details.js
@@ -0,0 +1,10 @@
+// show/hide build details
+jQuery(document).ready(function() {
+    jQuery(".header").click(function() {
+        var parent = jQuery(this).parent();
+        var ba = parent.find(".build-actions");
+        var bb = parent.find(".build-body");
+
+        ba.add(bb).toggle('slow');
+    });
+});
diff --git a/...ems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-script-helpers.js b/...ems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-script-helpers.js
@@ -0,0 +1,7 @@
+Handlebars.registerHelper('startScript', function() {
+    return new Handlebars.SafeString("<script>");
+});
+
+Handlebars.registerHelper('endScript', function() {
+    return new Handlebars.SafeString("</script>");
+});
diff --git a/...umsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly b/...umsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly
@@ -7,17 +7,5 @@
 
         By default we just include helpers to append script tags to your build card
     -->
-    <![CDATA[
-
-    <script type="text/javascript">
-        Handlebars.registerHelper('startScript', function() {
-            return new Handlebars.SafeString("<scr" + "ipt>");
-        });
-
-        Handlebars.registerHelper('endScript', function() {
-            return new Handlebars.SafeString("</scr" + "ipt>");
-        });
-    </script>
-
-    ]]>
+    <st:adjunct includes="au.com.centrumsystems.hudson.plugin.buildpipeline.extension.BuildCardExtension.build-card-script-helpers"/>
 </j:jelly>