Merge branch 'main' into dev

This commit is contained in:
Cohee
2023-07-19 18:41:48 +03:00
3 changed files with 8 additions and 1 deletions

View File

@@ -32,6 +32,8 @@
},
"outputs": [],
"source": [
"#@markdown (RECOMMENDED) Generates an API key for you to use with the API\n",
"secure = False #@param {type:\"boolean\"}\n",
"#@markdown Enables hosting of extensions backend for SillyTavern Extras\n",
"use_cpu = False #@param {type:\"boolean\"}\n",
"#@markdown Allows to run SillyTavern Extras on CPU (use if you're out of daily GPU allowance)\n",
@@ -80,6 +82,8 @@
" params.append('--cpu')\n",
"if use_sd_cpu:\n",
" params.append('--sd-cpu')\n",
"if secure:\n",
" params.append('--secure')\n",
"params.append('--share')\n",
"ExtrasModules = []\n",
"\n",

View File

@@ -7933,8 +7933,9 @@ $(document).ready(function () {
.closest(".mes_block")
.find(".mes_text")
.append(
`<textarea id='curEditTextarea' class='edit_textarea' style='max-width:auto; '>${text}</textarea>`
`<textarea id='curEditTextarea' class='edit_textarea' style='max-width:auto;'></textarea>`
);
$('#curEditTextarea').val(text);
let edit_textarea = $(this)
.closest(".mes_block")
.find(".edit_textarea");

View File

@@ -167,6 +167,8 @@ async function getManifests(names) {
const json = await response.json();
obj[name] = json;
resolve();
} else {
reject();
}
}).catch(err => reject() && console.log('Could not load manifest.json for ' + name, err));
});