[JENKINS-74032][JENKINS-73033][JENKINS-73034] Improve CSP compatibili…

…ty (#343) Co-authored-by: Basil Crow <[email protected]>
jenkinsci · Oct 29, 2024 · ebdfb00 · ebdfb00
1 parent bf10765
commit ebdfb00
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 72 deletions.
diff --git a/...resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/showDiffFiles.jelly b/...resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/showDiffFiles.jelly
@@ -8,8 +8,7 @@
     <!--syntax highlighting-->
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/highlight.js/styles/purebasic.css"/>
     <script src="${rootURL}/plugin/jobConfigHistory/highlight.js/highlight.pack.js"/>
-    <script>hljs.initHighlightingOnLoad();</script>
-
+    <st:adjunct includes="hudson.plugins.jobConfigHistory.show-diff-files-behaviour"/>
     <st:include it="${app}" page="sidepanel.jelly" />
     <j:set var="syntaxCheck1" value="${it.checkXmlSyntax(it.getTimestamp(1))}"/>
     <j:set var="syntaxCheck2" value="${it.checkXmlSyntax(it.getTimestamp(2))}"/>
@@ -62,29 +61,9 @@
               <j:set var="timestamp1" value="${it.getTimestamp(1)}"/>
               <j:set var="timestamp2" value="${it.getTimestamp(2)}"/>
 
-              <script>
-                var showVersionDiffsJs = true;
-
-                function toggleShowHideVersionDiffsJs(hideText, showText) {
-                  showVersionDiffsJs = !showVersionDiffsJs;
-                  if (showVersionDiffsJs === true) {
-                    document.getElementById("tbody_versionDiffsShown").style.display = '';
-                    document.getElementById("tbody_versionDiffsHidden").style.display = 'none';
-
-                    document.getElementById("showHideVersionDiffsJsButton").value = hideText;
-                  } else {
-                    document.getElementById("tbody_versionDiffsShown").style.display = 'none';
-                    document.getElementById("tbody_versionDiffsHidden").style.display = '';
-
-                    document.getElementById("showHideVersionDiffsJsButton").value = showText;
-                  }
-                }
-              </script>
               <div class="small-button-wrapper">
-                <j:set var="hideTextStr" value="${%Hide Version Changes}"/>
-                <j:set var="showTextStr" value="${%Show Version Changes}"/>
-
-                <input id="showHideVersionDiffsJsButton" class="small-button" type="button" value="${%Hide Version Changes}" onClick="toggleShowHideVersionDiffsJs('${hideTextStr}', '${showTextStr}');"/>
+                <input id="showHideVersionDiffsJsButton" class="small-button" type="button" data-hide-text="${%Hide Version Changes}"
+                       data-show-text="${%Show Version Changes}" value="${%Hide Version Changes}"/>
               </div>
               <div style="padding:2px"/>
 

diff --git a/...sources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/showDiffFiles.jelly b/...sources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/showDiffFiles.jelly
@@ -9,8 +9,7 @@
     <!--syntax highlighting-->
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/highlight.js/styles/purebasic.css"/>
     <script src="${rootURL}/plugin/jobConfigHistory/highlight.js/highlight.pack.js"/>
-    <script>hljs.initHighlightingOnLoad();</script>
-
+    <st:adjunct includes="hudson.plugins.jobConfigHistory.show-diff-files-behaviour"/>
     <st:include it="${it.project}" page="sidepanel.jelly" />
     <j:set var="syntaxCheck1" value="${it.checkXmlSyntax(it.getTimestamp(1))}"/>
     <j:set var="syntaxCheck2" value="${it.checkXmlSyntax(it.getTimestamp(2))}"/>
@@ -62,30 +61,9 @@
               <j:set var="timestamp1" value="${it.getTimestamp(1)}"/>
               <j:set var="timestamp2" value="${it.getTimestamp(2)}"/>
 
-              <script>
-                var showVersionDiffsJs = true;
-
-                function toggleShowHideVersionDiffsJs(hideText, showText) {
-                  showVersionDiffsJs = !showVersionDiffsJs;
-                  if (showVersionDiffsJs === true) {
-                    document.getElementById("tbody_versionDiffsShown").style.display = '';
-                    document.getElementById("tbody_versionDiffsHidden").style.display = 'none';
-
-                    document.getElementById("showHideVersionDiffsJsButton").value = hideText;
-
-                  } else {
-                    document.getElementById("tbody_versionDiffsShown").style.display = 'none';
-                    document.getElementById("tbody_versionDiffsHidden").style.display = '';
-
-                    document.getElementById("showHideVersionDiffsJsButton").value = showText;
-                  }
-                }
-              </script>
               <div class="small-button-wrapper">
-                <j:set var="hideTextStr" value="${%Hide Version Changes}"/>
-                <j:set var="showTextStr" value="${%Show Version Changes}"/>
-
-                <input id="showHideVersionDiffsJsButton" class="small-button" type="button" value="${%Hide Version Changes}" onClick="toggleShowHideVersionDiffsJs('${hideTextStr}', '${showTextStr}');"/>
+                <input id="showHideVersionDiffsJsButton" class="small-button" type="button" data-hide-text="${%Hide Version Changes}"
+                       data-show-text="${%Show Version Changes}" value="${%Hide Version Changes}"/>
               </div>
               <div style="padding:2px"/>
 

diff --git a/.../resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/showDiffFiles.jelly b/.../resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/showDiffFiles.jelly
@@ -1,5 +1,5 @@
 <?jelly escape-by-default='true'?>
-<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
+<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
   <l:layout title="${%Job Configuration History}">
 
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/css/diff_highlight.css"/>
@@ -8,7 +8,7 @@
     <!--syntax highlighting-->
     <link rel="stylesheet" type="text/css" href="${rootURL}/plugin/jobConfigHistory/highlight.js/styles/purebasic.css"/>
     <script src="${rootURL}/plugin/jobConfigHistory/highlight.js/highlight.pack.js"/>
-    <script>hljs.initHighlightingOnLoad();</script>
+    <st:adjunct includes="hudson.plugins.jobConfigHistory.show-diff-files-behaviour"/>
     <j:set var="syntaxCheck1" value="${it.checkXmlSyntax(request.getParameter('name'), it.getTimestamp(1))}"/>
     <j:set var="syntaxCheck2" value="${it.checkXmlSyntax(request.getParameter('name'), it.getTimestamp(2))}"/>
 
@@ -66,28 +66,9 @@
               <j:set var="timestamp1" value="${it.getTimestamp(1)}"/>
               <j:set var="timestamp2" value="${it.getTimestamp(2)}"/>
 
-              <script>
-                var showVersionDiffsJs = true;
-
-                function toggleShowHideVersionDiffsJs(hideText, showText) {
-                    showVersionDiffsJs = !showVersionDiffsJs;
-                    if (showVersionDiffsJs === true) {
-                        document.getElementById("tbody_versionDiffsShown").style.display = '';
-                        document.getElementById("tbody_versionDiffsHidden").style.display = 'none';
-
-                        document.getElementById("showHideVersionDiffsJsButton").value = hideText;
-                    } else {
-                        document.getElementById("tbody_versionDiffsShown").style.display = 'none';
-                        document.getElementById("tbody_versionDiffsHidden").style.display = '';
-
-                        document.getElementById("showHideVersionDiffsJsButton").value = showText;
-                    }
-                }
-              </script>
               <div class="small-button-wrapper">
-                <j:set var="hideTextStr" value="${%Hide Version Changes}"/>
-                <j:set var="showTextStr" value="${%Show Version Changes}"/>
-                <input id="showHideVersionDiffsJsButton" class="small-button" type="button" value="${%Hide Version Changes}" onClick="toggleShowHideVersionDiffsJs('${hideTextStr}', '${showTextStr}');"/>
+                <input id="showHideVersionDiffsJsButton" class="small-button" type="button" data-hide-text="${%Hide Version Changes}"
+                       data-show-text="${%Show Version Changes}" value="${%Hide Version Changes}"/>
               </div>
               <div style="padding:2px"/>
 

diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/show-diff-files-behaviour.js b/src/main/resources/hudson/plugins/jobConfigHistory/show-diff-files-behaviour.js
@@ -0,0 +1,26 @@
+window.addEventListener("DOMContentLoaded", () => {
+    hljs.initHighlightingOnLoad();
+
+    var showVersionDiffsJs = true;
+
+    function toggleShowHideVersionDiffsJs(button, hideText, showText) {
+        showVersionDiffsJs = !showVersionDiffsJs;
+        if (showVersionDiffsJs === true) {
+            document.getElementById("tbody_versionDiffsShown").style.display = "";
+            document.getElementById("tbody_versionDiffsHidden").style.display = "none";
+
+            button.value = hideText;
+        } else {
+            document.getElementById("tbody_versionDiffsShown").style.display = "none";
+            document.getElementById("tbody_versionDiffsHidden").style.display = "";
+
+            button.value = showText;
+        }
+    }
+
+    document.querySelector("#showHideVersionDiffsJsButton").addEventListener("click", (event) => {
+        const { hideText, showText } = event.target.dataset;
+
+        toggleShowHideVersionDiffsJs(event.target, hideText, showText);
+    });
+});