[JENKINS-74199] Extract inline script block and event handler in `Pol…

…lNowAction/action.jelly` (#47) * Extract inline onClick handler and JS script * Extract inline onClick handler and JS script * Extract inline onClick handler and JS script * Extract inline onClick handler and JS script
jenkinsci · Dec 27, 2024 · 70b2c2b · 70b2c2b
1 parent 8eb4e88
commit 70b2c2b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/src/main/resources/org/jenkinsci/plugins/pollscm/PollNowAction/action.jelly b/src/main/resources/org/jenkinsci/plugins/pollscm/PollNowAction/action.jelly
@@ -30,17 +30,8 @@ THE SOFTWARE.
     <j:set var="icon" value="${action.iconClassName != null ? action.iconClassName + ' icon-md' : action.iconFileName}"/>
     <j:if test="${icon!=null}">
         <j:set var="id" value="${h.generateId()}"/>
+        <st:adjunct includes="org.jenkinsci.plugins.pollscm.PollNowAction.polling"/>
         <l:task icon="${icon}" title="${action.displayName}"
-                href="${h.getActionUrl(it.url,action)}/polling" onclick="${'return poll_' + id + '(this)'}" post="true"/>
-        <script>
-            function poll_${id}(a) {
-                fetch(a.href, {
-                  method: "post",
-                  headers: crumb.wrap({}),
-                });
-                hoverNotification('${%Poll scheduled}',a.parentNode);
-                return false;
-            }
-        </script>
+                href="${h.getActionUrl(it.url,action)}/polling" data-callback="pollAction" post="true"/>
     </j:if>
 </j:jelly>
diff --git a/src/main/resources/org/jenkinsci/plugins/pollscm/PollNowAction/polling.js b/src/main/resources/org/jenkinsci/plugins/pollscm/PollNowAction/polling.js
@@ -0,0 +1,11 @@
+window.pollAction = function(element, event) {
+    event.preventDefault();
+
+    fetch(element.href, {
+        method: "post",
+        headers: crumb.wrap({})
+    });
+
+    hoverNotification('Poll scheduled', element.parentNode);
+    return false;
+};