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

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

Browse Source
This commit is contained in:
RossAscends
2023-06-28 22:31:49 +09:00
parent 667cbf6f0f 931fffaa5c
commit 38931e7a2f
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/scripts/extensions/expressions/index.js
View File

@@ -533,6 +533,11 @@ function drawSpritesList(character, labels, sprites) {
$('.expression_settings').show();
$('#image_list').empty();
$('#image_list').data('name', character);
if (!Array.isArray(labels)) {
return [];
}
labels.sort().forEach((item) => {
const sprite = sprites.find(x => x.label == item);

8
public/scripts/horde.js
View File

@@ -271,6 +271,14 @@ jQuery(function () {
placeholder: 'Select Horde models',
allowClear: true,
closeOnSelect: false,
templateSelection: function(data) {
// Customize the pillbox text by shortening the full text
return data.id;
},
templateResult: function(data) {
// Return the full text for the dropdown
return data.text;
},
});
}
})

3
public/scripts/openai.js
View File

@@ -990,8 +990,11 @@ function loadOpenAISettings(data, settings) {
$('#stream_toggle').prop('checked', oai_settings.stream_openai);
$('#model_openai_select').val(oai_settings.openai_model);
$(`#model_openai_select option[value="${oai_settings.openai_model}"`).attr('selected', true);
$('#model_claude_select').val(oai_settings.claude_model);
$(`#model_claude_select option[value="${oai_settings.claude_model}"`).attr('selected', true);
$('#model_windowai_select').val(oai_settings.windowai_model);
$(`#model_windowai_select option[value="${oai_settings.windowai_model}"`).attr('selected', true);
$('#openai_max_context').val(oai_settings.openai_max_context);
$('#openai_max_context_counter').text(`${oai_settings.openai_max_context}`);