From a21adf92ec04ed6b957da9f58d49afbb93d584e9 Mon Sep 17 00:00:00 2001
From: Norwin <noerw@users.noreply.github.com>
Date: Fri, 15 Jan 2021 04:55:51 +0000
Subject: [PATCH] restrict query selector to edit form (#14307)
Co-authored-by: Lauris BH <lauris@nix.lv>
---
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 54ef584224..ed7e585e4e 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 07d5b99e31..f64f9e6ef1 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -162,12 +162,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');