[JENKINS-73891] Extract inline JS in ConfigFilesUI/edit.jelly and `…

…ConfigFilesUI/show.jelly` (#342)
jenkinsci · Oct 22, 2024 · 88956aa · 88956aa
1 parent 4554bc6
commit 88956aa
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 17 deletions.
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/edit.jelly
@@ -57,13 +57,8 @@ THE SOFTWARE.
 	<j:if test="${contentType!=null}">
 		<st:adjunct includes="
 	        org.kohsuke.stapler.codemirror.mode.${contentType.cmMode}.${contentType.cmMode},
-	        org.kohsuke.stapler.codemirror.theme.default"/>
-		<script>
-	      var editor = CodeMirror.fromTextArea(document.getElementById("config.content"), {
-	        lineNumbers: true,
-	        matchBrackets: true,
-	        mode: "${contentType.mime}"
-	      });
-	    </script>
+	        org.kohsuke.stapler.codemirror.theme.default,
+	        org.jenkinsci.plugins.configfiles.ConfigFilesUI.setup-codemirror"/>
+		<span class="content-type-config" data-content-type="${contentType.mime}" data-read-only="false" style="display:none"/>
     </j:if>	
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/setup-codemirror.js b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/setup-codemirror.js
@@ -0,0 +1,14 @@
+document.addEventListener("DOMContentLoaded", function () {
+    const textarea = document.getElementById("config.content");
+    const contentTypeElement = document.querySelector(".content-type-config");
+
+    const contentType = contentTypeElement.dataset.contentType;
+    const readOnly = contentTypeElement.dataset.readOnly === "true";
+
+    CodeMirror.fromTextArea(textarea, {
+        lineNumbers: true,
+        matchBrackets: true,
+        mode: contentType,
+        readOnly: readOnly,
+    });
+});
diff --git a/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/show.jelly b/src/main/resources/org/jenkinsci/plugins/configfiles/ConfigFilesUI/show.jelly
@@ -46,14 +46,8 @@ THE SOFTWARE.
 	<j:if test="${contentType!=null}">
 		<st:adjunct includes="
 	        org.kohsuke.stapler.codemirror.mode.${contentType.cmMode}.${contentType.cmMode},
-	        org.kohsuke.stapler.codemirror.theme.default"/>
-		<script>
-	      var editor = CodeMirror.fromTextArea(document.getElementById("config.content"), {
-	        lineNumbers: true,
-	        matchBrackets: true,
-	        mode: "${contentType.mime}",
-	        readOnly: true
-	      });
-	    </script>
+	        org.kohsuke.stapler.codemirror.theme.default,
+	        org.jenkinsci.plugins.configfiles.ConfigFilesUI.setup-codemirror"/>
+		<span class="content-type-config" data-content-type="${contentType.mime}" data-read-only="true" style="display:none"/>
     </j:if>	
 </j:jelly>