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

Merge pull request #3154 from SillyTavern/optimize-past-swipes

Browse Source 
Optimize past swipes
This commit is contained in:
Cohee
2024-12-06 21:31:19 +02:00
committed by GitHub
parent 22ea5f3c3c 1a8e37d3a5
commit 3ed095bb0e
5 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -4184,7 +4184,7 @@
</label>
<label for="show_swipe_num_all_messages" class="checkbox_label" title="Display swipe numbers for all messages, not just the last." data-i18n="[title]Display swipe numbers for all messages, not just the last.">
<input id="show_swipe_num_all_messages" type="checkbox" />
<small data-i18n="Swipe # for All Messages">Swipe # for All Messages</small><i class="fa-solid fa-mobile-screen-button"></i>
<small data-i18n="Swipe # for All Messages">Swipe # for All Messages</small>
</label>
<label for="hotswapEnabled" class="checkbox_label" title="In the Character Management panel, show quick selection buttons for favorited characters." data-i18n="[title]In the Character Management panel, show quick selection buttons for favorited characters">
<input id="hotswapEnabled" type="checkbox" />

9
public/script.js
View File

@ -98,7 +98,6 @@ import {
resetMovableStyles,
forceCharacterEditorTokenize,
applyPowerUserSettings,
switchSwipeNumAllMessages,
} from './scripts/power-user.js';
import {
@ -7664,14 +7663,12 @@ export function showSwipeButtons() {
//allows for writing individual swipe counters for past messages
const lastSwipeCounter = $('.last_mes .swipes-counter');
lastSwipeCounter.text(swipeCounterText).show();
switchSwipeNumAllMessages();
}
export function hideSwipeButtons() {
$('#chat').find('.swipe_right').hide();
$('#chat').find('.last_mes .swipes-counter').hide();
$('#chat').find('.swipe_left').hide();
chatElement.find('.swipe_right').hide();
chatElement.find('.last_mes .swipes-counter').hide();
chatElement.find('.swipe_left').hide();
}
/**

15
public/scripts/extensions/stable-diffusion/index.js
View File

@ -60,7 +60,6 @@ import { ToolManager } from '../../tool-calling.js';
export { MODULE_NAME };
const MODULE_NAME = 'sd';
const UPDATE_INTERVAL = 1000;
// This is a 1x1 transparent PNG
const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
const CUSTOM_STOP_EVENT = 'sd_stop_generation';
@ -3687,8 +3686,6 @@ async function addSDGenButtons() {
const button = $('#sd_gen');
const dropdown = $('#sd_dropdown');
dropdown.hide();
button.hide();
messageButton.hide();
let popper = Popper.createPopper(button.get(0), dropdown.get(0), {
placement: 'top',
@ -3770,18 +3767,6 @@ function isValidState() {
}
}
async function moduleWorker() {
if (isValidState()) {
$('#sd_gen').show();
$('.sd_message_gen').show();
}
else {
$('#sd_gen').hide();
$('.sd_message_gen').hide();
}
}
setInterval(moduleWorker, UPDATE_INTERVAL);
let buttonAbortController = null;
async function sdMessageButton(e) {

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

@ -472,9 +472,9 @@ function switchCompactInputArea() {
$('#compact_input_area').prop('checked', power_user.compact_input_area);
}
export function switchSwipeNumAllMessages() {
function switchSwipeNumAllMessages() {
$('#show_swipe_num_all_messages').prop('checked', power_user.show_swipe_num_all_messages);
$('.mes:not(.last_mes) .swipes-counter').css('opacity', '').toggle(power_user.show_swipe_num_all_messages);
$('body').toggleClass('swipeAllMessages', !!power_user.show_swipe_num_all_messages);
}
var originalSliderValues = [];

10
public/style.css
View File

@ -1040,8 +1040,14 @@ body .panelControlBar {
height: var(--swipeCounterHeight);
}
.mes:not(.last_mes) .swipes-counter {
opacity: 0.3;
body:not(.swipeAllMessages) .mes:not(.last_mes) .swipes-counter {
visibility: hidden;
}
body.swipeAllMessages .mes:not(.last_mes) .swipes-counter {
/* Avoid expensive DOM queries */
opacity: 0.3 !important;
display: flex !important;
}
.swipe_left {