From 4bf9d6895c10f02ee2f015bb117c83115dbaba56 Mon Sep 17 00:00:00 2001 From: Neetigya Poddar Date: Mon, 9 Oct 2023 22:52:04 +0530 Subject: [PATCH 1/3] feat:Remove inline javascript code from BuoldTriggerStep --- .../steps/build/BuildTriggerStep/config.jelly | 14 +------------- .../support/steps/build/BuildTriggerStep/config.js | 13 +++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.js diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly index 54c1909f..67475521 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly @@ -44,19 +44,7 @@ THE SOFTWARE.
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.js b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.js new file mode 100644 index 00000000..86df74b4 --- /dev/null +++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.js @@ -0,0 +1,13 @@ +function loadParams() { + var div = document.getElementById('params'); + fetch('${descriptor.descriptorUrl}/parameters?job=' + encodeURIComponent(document.getElementById('${jobFieldId}').value) + '&context=${descriptor.contextEncoded}').then((rsp) => { + rsp.text().then((responseText) => { + if (rsp.ok) { + div.innerHTML = responseText; + Behaviour.applySubtree(div); + } else { + div.innerHTML = "ERROR: Failed to load parameter definitions: " + rsp.statusText; + } + }); + }); +} \ No newline at end of file From 78a02d5c22e04ef4b504dc29ece05c5c26ceff99 Mon Sep 17 00:00:00 2001 From: Neetigya Poddar Date: Tue, 10 Oct 2023 01:41:58 +0530 Subject: [PATCH 2/3] feat:Remove inline javascript code from BuoldTriggerStep --- .../support/steps/build/BuildTriggerStep/config.jelly | 4 +--- .../steps/build/BuildTriggerStep/{config.js => configLoad.js} | 0 2 files changed, 1 insertion(+), 3 deletions(-) rename src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/{config.js => configLoad.js} (100%) diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly index 67475521..01f8d5d9 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly @@ -43,8 +43,6 @@ THE SOFTWARE.
- + diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.js b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/configLoad.js similarity index 100% rename from src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.js rename to src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/configLoad.js From 1fd04a283d021e5c735e201bc22825d0df53dd9a Mon Sep 17 00:00:00 2001 From: Neetigya Poddar Date: Tue, 10 Oct 2023 08:28:23 +0530 Subject: [PATCH 3/3] feat:Remove inline javascript code from BuildTriggerStep --- .../steps/build/BuildTriggerStep/config.jelly | 7 ++++--- .../steps/build/BuildTriggerStep/configLoad.js | 13 +++++++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly index 01f8d5d9..097eedf3 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly +++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/config.jelly @@ -27,7 +27,9 @@ THE SOFTWARE. - + + + @@ -42,7 +44,6 @@ THE SOFTWARE. -
- +
diff --git a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/configLoad.js b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/configLoad.js index 86df74b4..e41776a7 100644 --- a/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/configLoad.js +++ b/src/main/resources/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerStep/configLoad.js @@ -1,6 +1,10 @@ -function loadParams() { - var div = document.getElementById('params'); - fetch('${descriptor.descriptorUrl}/parameters?job=' + encodeURIComponent(document.getElementById('${jobFieldId}').value) + '&context=${descriptor.contextEncoded}').then((rsp) => { +Behaviour.specify(".textbox-params-reference-holder", 'textbox-onblur-function', 0, function (e) { + var id = e.getAttribute('data-id'); + var textbox = document.getElementById(id); + + textbox.onblur = function(el) { + var div = document.getElementById('params'); + fetch(document.querySelector('#params').dataset.descriptor + '/parameters?job=' + encodeURIComponent(document.getElementById(document.querySelector('#params').dataset.jobfield).value) + '&context=${descriptor.contextEncoded}').then((rsp) => { rsp.text().then((responseText) => { if (rsp.ok) { div.innerHTML = responseText; @@ -10,4 +14,5 @@ function loadParams() { } }); }); -} \ No newline at end of file + } +}); \ No newline at end of file