[JENKINS-60866] Extract inline JS from progressive rendering (#6860)

* [JENKINS-60866] Extract inline JS from progressive rendering * Remove unused variable Co-authored-by: Tim Jacomb <[email protected]> Co-authored-by: Daniel Beck <[email protected]> Co-authored-by: Tim Jacomb <[email protected]>
jenkinsci · Jul 21, 2022 · f0f6b1e · f0f6b1e
1 parent 7fd9f22
commit f0f6b1e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/core/src/main/resources/lib/layout/progressiveRendering.jelly b/core/src/main/resources/lib/layout/progressiveRendering.jelly
@@ -28,7 +28,7 @@ THE SOFTWARE.
             Instance of jenkins.util.ProgressiveRendering.
         </st:attribute>
         <st:attribute name="callback" use="required">
-          JavaScript expression that evaluates to the function taking one JSON-valued parameter which renders results as they come.
+          Name of a global scope JavaScript function that takes one JSON-valued parameter which renders results as they come.
         </st:attribute>
         <st:attribute name="tooltip">
             Optional tooltip for progress bar.
@@ -38,5 +38,5 @@ THE SOFTWARE.
     <j:set var="id" value="${h.generateId()}"/>
     <t:progressBar id="${id}" pos="0" tooltip="${tooltip ?: '%progressMessage'}"/>
     <st:bind var="proxy" value="${handler}" />
-    <script>progressivelyRender(proxy, ${callback}, '${id}');</script>
+    <div class="progressive-rendering-information-holder" data-id="${id}" data-callback="${callback}" />
 </j:jelly>
diff --git a/core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js b/core/src/main/resources/lib/layout/progressiveRendering/progressiveRendering.js
@@ -1,4 +1,4 @@
-/* 
+/*
  * The MIT License
  *
  * Copyright 2012 Jesse Glick.
@@ -51,3 +51,9 @@ function progressivelyRender(handler, callback, statusId) {
         checkNewsLater(0);
     });
 }
+
+document.addEventListener('DOMContentLoaded', function() {
+ document.querySelectorAll('.progressive-rendering-information-holder').forEach(function (holder) {
+    progressivelyRender(window.proxy, window[holder.getAttribute('data-callback')], holder.getAttribute('data-id'));
+  });
+});