rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Prevent ticking if confirm canceled

Browse Source
This commit is contained in:
Cohee
2024-04-27 17:41:27 +03:00
parent c95956766e
commit 1dbe7897d4
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/tags.js
View File

@@ -1023,7 +1023,7 @@ function onViewTagsListClick() {
Drag handle to reorder. Click name to rename. Click color to change display.<br> Drag handle to reorder. Click name to rename. Click color to change display.<br>
${(power_user.bogus_folders ? 'Click on the folder icon to use this tag as a folder.<br>' : '')} ${(power_user.bogus_folders ? 'Click on the folder icon to use this tag as a folder.<br>' : '')}
<label class="checkbox flex-container alignitemscenter flexNoGap m-t-1" for="auto_sort_tags"> <label class="checkbox flex-container alignitemscenter flexNoGap m-t-1" for="auto_sort_tags">
<input type="checkbox" name="auto_sort_tags"${power_user.auto_sort_tags ? ' checked' : ''} /> <input type="checkbox" id="auto_sort_tags" name="auto_sort_tags" ${power_user.auto_sort_tags ? ' checked' : ''} />
<span data-i18n="Use alphabetical sorting"> <span data-i18n="Use alphabetical sorting">
Use alphabetical sorting Use alphabetical sorting
<div class="fa-solid fa-circle-info opacity50p" data-i18n="[title]If enabled, tags will automatically be sorted alphabetically on creation or rename.\nIf disabled, new tags will be appended at the end.\n\nIf a tag is manually reordered by dragging, automatic sorting will be disabled." <div class="fa-solid fa-circle-info opacity50p" data-i18n="[title]If enabled, tags will automatically be sorted alphabetically on creation or rename.\nIf disabled, new tags will be appended at the end.\n\nIf a tag is manually reordered by dragging, automatic sorting will be disabled."
@@ -1046,11 +1046,19 @@ function onViewTagsListClick() {
$('#dialogue_popup .tag-color2').on('change', (evt) => onTagColorize2(evt)); $('#dialogue_popup .tag-color2').on('change', (evt) => onTagColorize2(evt));
} }
function toggleAutoSortTags(toggle) { /**
* Print the list of tags in the tag management view
* @param {Event} event Event that triggered the color change
* @param {boolean} toggle State of the toggle
*/
function toggleAutoSortTags(event, toggle) {
if (toggle === power_user.auto_sort_tags) return; if (toggle === power_user.auto_sort_tags) return;
// Ask user to confirm if enabling and it was manually sorted before // Ask user to confirm if enabling and it was manually sorted before
if (toggle && isManuallySorted() && !confirm('Are you sure you want to automatically sort alphabetically?')) { if (toggle && isManuallySorted() && !confirm('Are you sure you want to automatically sort alphabetically?')) {
if (event.target instanceof HTMLInputElement) {
event.target.checked = false;
}
return; return;
} }
@@ -1456,7 +1464,7 @@ export function initTags() {
$(document).on('input', '#dialogue_popup input[name="auto_sort_tags"]', (evt) => { $(document).on('input', '#dialogue_popup input[name="auto_sort_tags"]', (evt) => {
const toggle = $(evt.target).is(':checked'); const toggle = $(evt.target).is(':checked');
toggleAutoSortTags(toggle); toggleAutoSortTags(evt.originalEvent, toggle);
printViewTagList(); printViewTagList();
}); });
$(document).on('focusout', `#dialogue_popup .tag_view_name`, (evt) => { $(document).on('focusout', `#dialogue_popup .tag_view_name`, (evt) => {