rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Better opacity handling. Remove debug logs

This commit is contained in:
Cohee 2024-10-01 19:48:46 +03:00
parent cd297f926e
commit d5b845345e
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/script.js
View File

@ -7493,29 +7493,33 @@ export function showSwipeButtons() {
const currentMessage = $('#chat').children().filter(`[mesid="${chat.length - 1}"]`); const currentMessage = $('#chat').children().filter(`[mesid="${chat.length - 1}"]`);
const swipeId = chat[chat.length - 1].swipe_id; const swipeId = chat[chat.length - 1].swipe_id;
const swipeCounterText = (`${(swipeId + 1)}\u200B/\u200b${(chat[chat.length - 1].swipes.length)}`); const swipeCounterText = (`${(swipeId + 1)}\u200B/\u200b${(chat[chat.length - 1].swipes.length)}`);
const swipeRight = currentMessage.find('.swipe_right');
const swipeLeft = currentMessage.find('.swipe_left');
const swipeCounter = currentMessage.find('.swipes-counter');
if (swipeId !== undefined && (chat[chat.length - 1].swipes.length > 1 || swipeId > 0)) { if (swipeId !== undefined && (chat[chat.length - 1].swipes.length > 1 || swipeId > 0)) {
currentMessage.children('.swipe_left').css('display', 'flex'); swipeLeft.css('display', 'flex');
} }
//only show right when generate is off, or when next right swipe would not make a generate happen //only show right when generate is off, or when next right swipe would not make a generate happen
if (is_send_press === false || chat[chat.length - 1].swipes.length >= swipeId) { if (is_send_press === false || chat[chat.length - 1].swipes.length >= swipeId) {
console.error('showingSwipeButtons: showing.'); // console.error('showingSwipeButtons: showing.');
currentMessage.find('.swipe_right').css('display', 'flex'); swipeRight.css('display', 'flex').css('opacity', '0.3');
currentMessage.find('.swipe_right').css('opacity', '0.3'); swipeCounter.css('opacity', '0.3');
} }
//console.log((chat[chat.length - 1])); //console.log((chat[chat.length - 1]));
if ((chat[chat.length - 1].swipes.length - swipeId) === 1) { if ((chat[chat.length - 1].swipes.length - swipeId) === 1) {
console.error('highlighting R swipe'); // console.error('highlighting R swipe');
//chevron was moved out of hardcode in HTML to class toggle dependent on last_mes or not //chevron was moved out of hardcode in HTML to class toggle dependent on last_mes or not
//necessary for 'swipe_right' div in past messages to have no chevron if 'show swipes for all messages' is turned on //necessary for 'swipe_right' div in past messages to have no chevron if 'show swipes for all messages' is turned on
currentMessage.find('.swipe_right').css('opacity', '0.7'); swipeRight.css('opacity', '0.7');
swipeCounter.css('opacity', '0.7');
} }
//console.log(swipesCounterHTML); //console.log(swipesCounterHTML);
//allows for writing individual swipe counters for past messages //allows for writing individual swipe counters for past messages
$('.last_mes .swipes-counter').text(swipeCounterText); const lastSwipeCounter = $('.last_mes .swipes-counter');
$('.last_mes .swipes-counter').show(); lastSwipeCounter.text(swipeCounterText).show();
//console.log(swipeId); //console.log(swipeId);
//console.log(chat[chat.length - 1].swipes.length); //console.log(chat[chat.length - 1].swipes.length);

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

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

5
public/style.css
View File

@ -1010,11 +1010,14 @@ body .panelControlBar {
min-width: 40px; min-width: 40px;
display: flex; display: flex;
justify-content: center; justify-content: center;
opacity: 0.7;
margin-bottom: var(--swipeCounterMargin); margin-bottom: var(--swipeCounterMargin);
height: var(--swipeCounterHeight); height: var(--swipeCounterHeight);
} }
.mes:not(.last_mes) .swipes-counter {
opacity: 0.3;
}
.swipe_left { .swipe_left {
right: auto; right: auto;
left: 20px; left: 20px;