rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2768 from SillyTavern/expand-contenteditable

This commit is contained in:
Cohee 2024-09-04 05:09:44 +03:00 committed by GitHub
parent 8952b93560 37bee43075
commit 7cba747c52
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/index.html
View File

@ -3085,8 +3085,9 @@
<select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select>
</div>
<div>
<label for="context_story_string">
<label for="context_story_string" class="flex-container">
<small data-i18n="Story String">Story String</small>
<i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="context_story_string" title="Expand the editor" data-i18n="[title]Expand the editor"></i>
</label>
<div contenteditable="true" id="context_story_string" class="text_pole textarea_compact"></div>
<div class="flex-container">
@ -3236,8 +3237,9 @@
<input type="text" id="instruct_activation_regex" class="text_pole textarea_compact" placeholder="e.g. /llama(-)?[3|3.1]/i"></input>
</div>
<div>
<label>
<label for="instruct_system_prompt" class="flex-container">
<small data-i18n="System Prompt">System Prompt</small>
<i class="editor_maximize fa-solid fa-maximize right_menu_button" data-for="instruct_system_prompt" title="Expand the editor" data-i18n="[title]Expand the editor"></i>
</label>
<div contenteditable="true" id="instruct_system_prompt" class="text_pole textarea_compact"></div>
</div>

10
public/scripts/chats.js
View File

@ -1416,6 +1416,7 @@ jQuery(function () {
$(document).on('click', '.editor_maximize', function () {
const broId = $(this).attr('data-for');
const bro = $(`#${broId}`);
const contentEditable = bro.is('[contenteditable]');
const withTab = $(this).attr('data-tab');
if (!bro.length) {
@ -1427,11 +1428,16 @@ jQuery(function () {
wrapper.classList.add('height100p', 'wide100p', 'flex-container');
wrapper.classList.add('flexFlowColumn', 'justifyCenter', 'alignitemscenter');
const textarea = document.createElement('textarea');
textarea.value = String(bro.val());
textarea.value = String(contentEditable ? bro[0].innerText : bro.val());
textarea.classList.add('height100p', 'wide100p', 'maximized_textarea');
bro.hasClass('monospace') && textarea.classList.add('monospace');
textarea.addEventListener('input', function () {
bro.val(textarea.value).trigger('input');
if (contentEditable) {
bro[0].innerText = textarea.value;
bro.trigger('input');
} else {
bro.val(textarea.value).trigger('input');
}
});
wrapper.appendChild(textarea);