Merge branch 'release' into staging

9a595af55b8f39fa2b0da887b70ccc5ec261867e

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 8da417b0ea43d0312cce1d27ce4391815e583da1 ac7076c832c9500accfe874ef8ace72617536b6f
1 files changed, +6 -6Ignore whitespace
public/scripts/textgen-settings.js+6 -6
@@ -1152,6 +1152,12 @@ function setSettingByName(setting, value, trigger) {
1152 return;1152 return;
1153 }1153 }
11541154
1155 if ('json_schema' === setting) {
1156 settings.json_schema = value ?? null;
1157 $('#tabby_json_schema').val(value ? JSON.stringify(settings.json_schema, null, 2) : '');
1158 return;
1159 }
1160
1155 if (value === null || value === undefined) {1161 if (value === null || value === undefined) {
1156 return;1162 return;
1157 }1163 }
@@ -1192,12 +1198,6 @@ function setSettingByName(setting, value, trigger) {
1192 return;1198 return;
1193 }1199 }
11941200
1195 if ('json_schema' === setting) {
1196 settings.json_schema = value ?? null;
1197 $('#tabby_json_schema').val(value ? JSON.stringify(settings.json_schema, null, 2) : '');
1198 return;
1199 }
1200
1201 const isCheckbox = $(`#${setting}_textgenerationwebui`).attr('type') == 'checkbox';1201 const isCheckbox = $(`#${setting}_textgenerationwebui`).attr('type') == 'checkbox';
1202 const isText = $(`#${setting}_textgenerationwebui`).attr('type') == 'text' || $(`#${setting}_textgenerationwebui`).is('textarea');1202 const isText = $(`#${setting}_textgenerationwebui`).attr('type') == 'text' || $(`#${setting}_textgenerationwebui`).is('textarea');
1203 if (isCheckbox) {1203 if (isCheckbox) {