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 random bg1 not updating correctly

Browse Source
This commit is contained in:
RossAscends
2023-04-26 23:10:15 +09:00
parent 8f3da37c61
commit c354f8ee30
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/script.js
View File

@ -1500,9 +1500,9 @@ async function Generate(type, automatic_trigger, force_name2) {
} }
const blockHeading = const blockHeading =
main_api === 'openai' ? '<START>' : // OpenAI handler always expects it main_api === 'openai' ? '<START>' : // OpenAI handler always expects it
power_user.custom_chat_separator ? power_user.custom_chat_separator : power_user.custom_chat_separator ? power_user.custom_chat_separator :
power_user.disable_examples_formatting ? '' : power_user.disable_examples_formatting ? '' :
is_pygmalion ? '<START>' : `This is how ${name2} should talk`; is_pygmalion ? '<START>' : `This is how ${name2} should talk`;
let mesExamplesArray = mesExamples.split(/<START>/gi).slice(1).map(block => `${blockHeading}\n${block.trim()}\n`); let mesExamplesArray = mesExamples.split(/<START>/gi).slice(1).map(block => `${blockHeading}\n${block.trim()}\n`);
if (main_api === 'openai') { if (main_api === 'openai') {
@ -3351,7 +3351,7 @@ function read_bg_load(input) {
setBackground(html); setBackground(html);
$("#bg1").css( $("#bg1").css(
"background-image", "background-image",
`url(${e.target.result})` `url("${e.target.result}")`
); );
$("#form_bg_download").after( $("#form_bg_download").after(
`<div class="bg_example" bgfile="${html}" style="background-image: url('${getThumbnailUrl('bg', html)}');"> `<div class="bg_example" bgfile="${html}" style="background-image: url('${getThumbnailUrl('bg', html)}');">

2
public/style.css
View File

@ -180,7 +180,7 @@ code {
} }
#bg1 { #bg1 {
background-image: url(backgrounds/tavern1.jpg); background-image: url('backgrounds/tavern day.jpg');
z-index: -2; z-index: -2;
} }

2
server.js
View File

@ -959,7 +959,7 @@ app.post("/getuseravatars", jsonParser, function (request, response) {
}); });
app.post("/setbackground", jsonParser, function (request, response) { app.post("/setbackground", jsonParser, function (request, response) {
var bg = "#bg1 {background-image: url(../backgrounds/" + request.body.bg + ");}"; var bg = "#bg1 {background-image: url('../backgrounds/" + request.body.bg + "');}";
fs.writeFile('public/css/bg_load.css', bg, 'utf8', function (err) { fs.writeFile('public/css/bg_load.css', bg, 'utf8', function (err) {
if (err) { if (err) {
response.send(err); response.send(err);