From 817d7692607b95837e2f32ddc61aa64f8cc634d5 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:16:57 -0400
Subject: [PATCH 1/6] extract JS in tagform.jelly

---
 .../scm/cvstagging/CvsTagAction/create-another-tag.js     | 8 ++++++++
 .../hudson/scm/cvstagging/CvsTagAction/tagForm.jelly      | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js

diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
new file mode 100644
index 0000000..f720a70
--- /dev/null
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
@@ -0,0 +1,8 @@
+document.addEventListener('DOMContentLoaded', () => {
+
+    document.getElementById('create-another-tag-button')
+        .addEventListener('click', () => {
+            document.getElementById('tagForm').show();
+            document.getElementById('tagButton').style.display = 'none';
+        });
+});
diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
index 41be59f..f77193d 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
@@ -86,10 +86,10 @@ THE SOFTWARE.
             </j:forEach>
           </p>
 
+          <st:adjunct includes="hudson.scm.cvstagging.CvsTagAction.create-another-tag"/>
           <j:if test="${h.hasPermission(it.build,it.permission)}">
             <p id="tagButton">
-              <input type="button" value="${%Create another tag}"
-                     onclick="Element.show('tagForm');Element.hide('tagButton')"/>
+              <input type="button" value="${%Create another tag}" id="create-another-tag-button" />
             </p>
 
             <div id="tagForm" style="display:none;">

From b074c570817ffec4af409039d7cdb69aaac414a5 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:17:30 -0400
Subject: [PATCH 2/6] extract JS in tagform.jelly

---
 .../hudson/scm/cvstagging/CvsTagAction/create-another-tag.js     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
index f720a70..f11622f 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
@@ -6,3 +6,4 @@ document.addEventListener('DOMContentLoaded', () => {
             document.getElementById('tagButton').style.display = 'none';
         });
 });
+

From 48ca48aebeef2c0375483e68af3f8669702ae713 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 22 Oct 2024 12:07:35 -0400
Subject: [PATCH 3/6] address comments

---
 .../hudson/scm/cvstagging/CvsTagAction/create-another-tag.js   | 3 +--
 .../resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
index f11622f..3504e71 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
@@ -2,8 +2,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
     document.getElementById('create-another-tag-button')
         .addEventListener('click', () => {
-            document.getElementById('tagForm').show();
+            document.getElementById('tagForm').style.display = 'block';
             document.getElementById('tagButton').style.display = 'none';
         });
 });
-
diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
index f77193d..a552098 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
@@ -86,8 +86,8 @@ THE SOFTWARE.
             </j:forEach>
           </p>
 
-          <st:adjunct includes="hudson.scm.cvstagging.CvsTagAction.create-another-tag"/>
           <j:if test="${h.hasPermission(it.build,it.permission)}">
+            <st:adjunct includes="hudson.scm.cvstagging.CvsTagAction.create-another-tag"/>
             <p id="tagButton">
               <input type="button" value="${%Create another tag}" id="create-another-tag-button" />
             </p>

From c3eb5f3edfef13a31b1849e4fe53df38d737bc60 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 22 Oct 2024 13:06:36 -0400
Subject: [PATCH 4/6] remove unnecessary id

---
 .../scm/cvstagging/CvsTagAction/create-another-tag.js  | 10 ++++------
 .../hudson/scm/cvstagging/CvsTagAction/tagForm.jelly   |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
index 3504e71..aa03e5b 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
@@ -1,8 +1,6 @@
 document.addEventListener('DOMContentLoaded', () => {
-
-    document.getElementById('create-another-tag-button')
-        .addEventListener('click', () => {
-            document.getElementById('tagForm').style.display = 'block';
-            document.getElementById('tagButton').style.display = 'none';
-        });
+    document.querySelector('#tagButton input').addEventListener('click', () => {
+        document.getElementById('tagForm').style.display = 'block';
+        document.getElementById('tagButton').style.display = 'none';
+    });
 });
diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
index a552098..1c96bb7 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
@@ -89,7 +89,7 @@ THE SOFTWARE.
           <j:if test="${h.hasPermission(it.build,it.permission)}">
             <st:adjunct includes="hudson.scm.cvstagging.CvsTagAction.create-another-tag"/>
             <p id="tagButton">
-              <input type="button" value="${%Create another tag}" id="create-another-tag-button" />
+              <input type="button" value="${%Create another tag}" />
             </p>
 
             <div id="tagForm" style="display:none;">

From 4fd84ef1e94c35a72daa9bbd6faf3cc67fdfa7d4 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 22 Oct 2024 10:21:10 -0700
Subject: [PATCH 5/6] Consistent formatting with other PRs

---
 .../scm/cvstagging/CvsTagAction/create-another-tag.js  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
index aa03e5b..2d2154f 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/create-another-tag.js
@@ -1,6 +1,6 @@
-document.addEventListener('DOMContentLoaded', () => {
-    document.querySelector('#tagButton input').addEventListener('click', () => {
-        document.getElementById('tagForm').style.display = 'block';
-        document.getElementById('tagButton').style.display = 'none';
-    });
+document.addEventListener("DOMContentLoaded", function () {
+  document.querySelector("#tagButton input").addEventListener("click", function () {
+    document.getElementById("tagForm").style.display = "block";
+    document.getElementById("tagButton").style.display = "none";
+  });
 });

From 0b1d2105d2cc0549c36a9ab867fe15a4bce9207b Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Tue, 22 Oct 2024 10:22:20 -0700
Subject: [PATCH 6/6] Consistent formatting with code before this PR and with
 code two lines above

---
 .../resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
index 1c96bb7..7926d59 100644
--- a/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
+++ b/src/main/resources/hudson/scm/cvstagging/CvsTagAction/tagForm.jelly
@@ -89,7 +89,7 @@ THE SOFTWARE.
           <j:if test="${h.hasPermission(it.build,it.permission)}">
             <st:adjunct includes="hudson.scm.cvstagging.CvsTagAction.create-another-tag"/>
             <p id="tagButton">
-              <input type="button" value="${%Create another tag}" />
+              <input type="button" value="${%Create another tag}"/>
             </p>
 
             <div id="tagForm" style="display:none;">