mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Merge branch 'main' into dev
This commit is contained in:
@@ -32,6 +32,8 @@
|
|||||||
},
|
},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"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",
|
"#@markdown Enables hosting of extensions backend for SillyTavern Extras\n",
|
||||||
"use_cpu = False #@param {type:\"boolean\"}\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",
|
"#@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",
|
" params.append('--cpu')\n",
|
||||||
"if use_sd_cpu:\n",
|
"if use_sd_cpu:\n",
|
||||||
" params.append('--sd-cpu')\n",
|
" params.append('--sd-cpu')\n",
|
||||||
|
"if secure:\n",
|
||||||
|
" params.append('--secure')\n",
|
||||||
"params.append('--share')\n",
|
"params.append('--share')\n",
|
||||||
"ExtrasModules = []\n",
|
"ExtrasModules = []\n",
|
||||||
"\n",
|
"\n",
|
||||||
|
|||||||
@@ -7933,8 +7933,9 @@ $(document).ready(function () {
|
|||||||
.closest(".mes_block")
|
.closest(".mes_block")
|
||||||
.find(".mes_text")
|
.find(".mes_text")
|
||||||
.append(
|
.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)
|
let edit_textarea = $(this)
|
||||||
.closest(".mes_block")
|
.closest(".mes_block")
|
||||||
.find(".edit_textarea");
|
.find(".edit_textarea");
|
||||||
|
|||||||
@@ -167,6 +167,8 @@ async function getManifests(names) {
|
|||||||
const json = await response.json();
|
const json = await response.json();
|
||||||
obj[name] = json;
|
obj[name] = json;
|
||||||
resolve();
|
resolve();
|
||||||
|
} else {
|
||||||
|
reject();
|
||||||
}
|
}
|
||||||
}).catch(err => reject() && console.log('Could not load manifest.json for ' + name, err));
|
}).catch(err => reject() && console.log('Could not load manifest.json for ' + name, err));
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user