From 096aa18249f5beea9fac37a668e4318bdc06aa2e Mon Sep 17 00:00:00 2001
From: Norwin <noerw@users.noreply.github.com>
Date: Thu, 14 Jan 2021 13:03:16 +0000
Subject: [PATCH] Fix edit-label form init (#14337)

---
 templates/repo/issue/labels/edit_delete_label.tmpl | 2 +-
 web_src/js/index.js                                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 4ffa20ef17..6c08752336 100644
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -23,7 +23,7 @@
 		{{.i18n.Tr "repo.issues.label_modify"}}
 	</div>
 	<div class="content">
-		<form class="ui edit-label form" action="{{$.Link}}/edit" method="post">
+		<form class="ui edit-label form ignore-dirty" action="{{$.Link}}/edit" method="post">
 			{{.CsrfTokenHtml}}
 			<input id="label-modal-id" name="id" type="hidden">
 			<div class="ui grid">
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 8499904bf9..8917ffda6f 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -163,12 +163,12 @@ function initLabelEdit() {
     $('.minicolors-swatch-color').css('background-color', color_hex);
   });
   $('.edit-label-button').on('click', function () {
-    $('.color-picker').minicolors('value', $(this).data('color'));
+    $('.edit-label .color-picker').minicolors('value', $(this).data('color'));
     $('#label-modal-id').val($(this).data('id'));
     $('.edit-label .new-label-input').val($(this).data('title'));
     $('.edit-label .new-label-desc-input').val($(this).data('description'));
     $('.edit-label .color-picker').val($(this).data('color'));
-    $('.minicolors-swatch-color').css('background-color', $(this).data('color'));
+    $('.edit-label .minicolors-swatch-color').css('background-color', $(this).data('color'));
     $('.edit-label.modal').modal({
       onApprove() {
         $('.edit-label.form').trigger('submit');