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

fix zenslider and labmode compatibility check

Browse Source
This commit is contained in:
RossAscends
2023-11-12 17:23:29 +09:00
parent 5331b5dc8a
commit 986eef9830
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -121,7 +121,7 @@
<div id="clickSlidersTips" data-i18n="clickslidertips" class="toggle-description wide100p editable-slider-notification">
Click slider numbers to input manually.
</div>
<div id="labModeWarning" class="redWarningBG textAlignCenter">MAD LAB MODE ON</div>
<div id="labModeWarning" class="redWarningBG textAlignCenter hidden">MAD LAB MODE ON</div>
<a href="https://docs.sillytavern.app/usage/common-settings/" target="_blank" title="Documentation on sampling parameters.">
<span name="samplerHelpButton" class="note-link-span topRightInset fa-solid fa-circle-question"></span>
</a>

4
public/script.js
View File

@ -993,7 +993,7 @@ function getTagBlock(item) {
const count = Object.values(tag_map).flat().filter(x => x == item.id).length;
const template = $('#bogus_folder_template .bogus_folder_select').clone();
template.attr({ 'tagid': item.id, 'id': `BogusFolder${item.id}` });
template.find('.avatar').css({'background-color': item.color, 'color': item.color2 });
template.find('.avatar').css({ 'background-color': item.color, 'color': item.color2 });
template.find('.ch_name').text(item.name);
template.find('.bogus_folder_counter').text(count);
return template;
@ -9057,7 +9057,7 @@ jQuery(async function () {
//yolo anything for Lab Mode
if (power_user.enableLabMode) {
console.log($(masterElement).attr('id'), myValue)
//console.log($(masterElement).attr('id'), myValue)
$(masterElement).val(myValue).trigger('input')
return
}

35
public/scripts/power-user.js
View File

@ -432,10 +432,12 @@ var originalSliderValues = []
async function switchLabMode() {
if (power_user.enableZenSliders) {
//force disable ZenSliders for Lab Mode
$("#enableZenSliders").trigger('click')
/* if (power_user.enableZenSliders && power_user.enableLabMode) {
toastr.warning("Can't start Lab Mode while Zen Sliders are active")
return
//$("#enableZenSliders").trigger('click')
}
*/
await delay(100)
const value = localStorage.getItem(storage_keys.enableLabMode);
power_user.enableLabMode = value === null ? false : value == "true";
@ -457,7 +459,7 @@ async function switchLabMode() {
.attr('min', '-99999')
.attr('max', '99999')
.attr('step', '0.001')
$("#labModeWarning").show()
$("#labModeWarning").removeClass('hidden')
//$("#advanced-ai-config-block input[type='range']").hide()
} else {
@ -470,7 +472,7 @@ async function switchLabMode() {
.trigger('input')
});
$("#advanced-ai-config-block input[type='range']").show()
$("#labModeWarning").hide()
$("#labModeWarning").addClass('hidden')
}
}
@ -1550,7 +1552,7 @@ export function fuzzySearchWorldInfo(data, searchValue) {
export function fuzzySearchTags(searchValue) {
const fuse = new Fuse(tags, {
keys: [
{ name: 'name', weight: 1},
{ name: 'name', weight: 1 },
],
includeScore: true,
ignoreLocation: true,
@ -2680,28 +2682,31 @@ $(document).ready(() => {
});
$("#enableZenSliders").on("input", function () {
if (power_user.enableLabMode) {
const value = !!$(this).prop('checked');
if (power_user.enableLabMode === true && value === true) {
//disallow zenSliders while Lab Mode is active
toastr.warning('ZenSliders not allowed in Mad Lab Mode')
$(this).prop('checked', false);
toastr.warning('Disable Mad Lab Mode before enabling Zen Sliders')
$(this).prop('checked', false).trigger('input');
return
}
const value = !!$(this).prop('checked');
power_user.enableZenSliders = value;
localStorage.setItem(storage_keys.enableZenSliders, Boolean(power_user.enableZenSliders));
saveSettingsDebounced();
switchZenSliders();
});
$("#enableLabMode").on("input", function () {
if (power_user.enableZenSliders) {
const value = !!$(this).prop('checked');
if (power_user.enableZenSliders === true && value === true) {
//disallow Lab Mode if ZenSliders are active
toastr.warning('Mad Lab Mode not allowed while ZenSliders are active')
$(this).prop('checked', false);
toastr.warning('Disable Zen Sliders before enabling Mad Lab Mode')
$(this).prop('checked', false).trigger('input');;
return
}
const value = !!$(this).prop('checked');
power_user.enableLabMode = value;
localStorage.setItem(storage_keys.enableLabMode, Boolean(power_user.enableLabMode));
saveSettingsDebounced();
switchLabMode();
});
@ -2815,7 +2820,7 @@ $(document).ready(() => {
switchSimpleMode();
});
$('#bogus_folders').on('input', function() {
$('#bogus_folders').on('input', function () {
const value = !!$(this).prop('checked');
power_user.bogus_folders = value;
saveSettingsDebounced();