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

Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

This commit is contained in:
RossAscends 2023-11-06 05:01:17 +09:00
parent 912ea8017f da4c88f7ec
commit f1eaa18831
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,8 +444,8 @@ async function switchZenSliders() {
$("#textgenerationwebui_api-settings input[type='number']").hide(); $("#textgenerationwebui_api-settings input[type='number']").hide();
$("#pro-settings-block input[type='number']").hide(); $("#pro-settings-block input[type='number']").hide();
$("#seed_textgenerationwebui").show(); $("#seed_textgenerationwebui").show();
$(`#range_block_textgenerationwebui input[type='range'], $(`#range_block_textgenerationwebui input[type='range'],
#textgenerationwebui_api-settings input[type='range'], #textgenerationwebui_api-settings input[type='range'],
#pro-settings-block input[type='range']`).each( #pro-settings-block input[type='range']`).each(
function () { function () {
CreateZenSliders($(this)) CreateZenSliders($(this))
@ -1087,7 +1087,7 @@ function loadPowerUserSettings(settings, data) {
power_user.timestamps_enabled = timestamps === null ? true : timestamps == "true"; power_user.timestamps_enabled = timestamps === null ? true : timestamps == "true";
power_user.mesIDDisplay_enabled = mesIDDisplay === null ? true : mesIDDisplay == "true"; power_user.mesIDDisplay_enabled = mesIDDisplay === null ? true : mesIDDisplay == "true";
power_user.expand_message_actions = expandMessageActions === null ? true : expandMessageActions == "true"; power_user.expand_message_actions = expandMessageActions === null ? true : expandMessageActions == "true";
power_user.enableZenSliders = enableZenSliders === null ? true : enableZenSliders == "true"; power_user.enableZenSliders = enableZenSliders === null ? false : enableZenSliders == "true";
power_user.avatar_style = Number(localStorage.getItem(storage_keys.avatar_style) ?? avatar_styles.ROUND); power_user.avatar_style = Number(localStorage.getItem(storage_keys.avatar_style) ?? avatar_styles.ROUND);
//power_user.chat_display = Number(localStorage.getItem(storage_keys.chat_display) ?? chat_styles.DEFAULT); //power_user.chat_display = Number(localStorage.getItem(storage_keys.chat_display) ?? chat_styles.DEFAULT);
power_user.chat_width = Number(localStorage.getItem(storage_keys.chat_width) ?? 50); power_user.chat_width = Number(localStorage.getItem(storage_keys.chat_width) ?? 50);
@ -1827,7 +1827,7 @@ function setAvgBG() {
.attr('src') .attr('src')
.replace(/^url\(['"]?/, '') .replace(/^url\(['"]?/, '')
.replace(/['"]?\)$/, ''); .replace(/['"]?\)$/, '');
const userAvatar = new Image() const userAvatar = new Image()
userAvatar.src = $("#user_avatar_block .avatar.selected img") userAvatar.src = $("#user_avatar_block .avatar.selected img")
.attr('src') .attr('src')
@ -1858,7 +1858,7 @@ function setAvgBG() {
//console.log(rgb); //console.log(rgb);
$("#bot-mes-blur-tint-color-picker").attr('color', 'rgb(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ')'); $("#bot-mes-blur-tint-color-picker").attr('color', 'rgb(' + rgb.r + ',' + rgb.g + ',' + rgb.b + ')');
} }
userAvatar.onload = function () { userAvatar.onload = function () {
var rgb = getAverageRGB(userAvatar); var rgb = getAverageRGB(userAvatar);
//console.log(`average color of the user avatar is:`); //console.log(`average color of the user avatar is:`);
@ -1964,16 +1964,16 @@ function setAvgBG() {
//this version keeps BG and main text in same hue //this version keeps BG and main text in same hue
/* function getReadableTextColor(rgb) { /* function getReadableTextColor(rgb) {
const [r, g, b] = rgb; const [r, g, b] = rgb;
// Convert RGB to HSL // Convert RGB to HSL
const rgbToHsl = (r, g, b) => { const rgbToHsl = (r, g, b) => {
const max = Math.max(r, g, b); const max = Math.max(r, g, b);
const min = Math.min(r, g, b); const min = Math.min(r, g, b);
const d = max - min; const d = max - min;
const l = (max + min) / 2; const l = (max + min) / 2;
if (d === 0) return [0, 0, l]; if (d === 0) return [0, 0, l];
const s = l > 0.5 ? d / (2 - max - min) : d / (max + min); const s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
const h = (() => { const h = (() => {
switch (max) { switch (max) {
@ -1985,16 +1985,16 @@ function setAvgBG() {
return (r - g) / d + 4; return (r - g) / d + 4;
} }
})() / 6; })() / 6;
return [h, s, l]; return [h, s, l];
}; };
const [h, s, l] = rgbToHsl(r / 255, g / 255, b / 255); const [h, s, l] = rgbToHsl(r / 255, g / 255, b / 255);
// Calculate appropriate text color based on background color // Calculate appropriate text color based on background color
const targetLuminance = l > 0.5 ? 0.2 : 0.8; const targetLuminance = l > 0.5 ? 0.2 : 0.8;
const targetSaturation = s > 0.5 ? s - 0.2 : s + 0.2; const targetSaturation = s > 0.5 ? s - 0.2 : s + 0.2;
const [rNew, gNew, bNew] = hslToRgb(h, targetSaturation, targetLuminance); const [rNew, gNew, bNew] = hslToRgb(h, targetSaturation, targetLuminance);
// Return the text color in RGBA format // Return the text color in RGBA format
return `rgba(${rNew.toFixed(0)}, ${gNew.toFixed(0)}, ${bNew.toFixed(0)}, 1)`; return `rgba(${rNew.toFixed(0)}, ${gNew.toFixed(0)}, ${bNew.toFixed(0)}, 1)`;
}*/ }*/