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

Added "Send on Enter" power user setting

Browse Source 
Defaults to on. Intended for use on mobile, so line breaks can be more easily added while typing.
This commit is contained in:
Halsey1006
2023-04-24 19:13:42 -07:00
committed by GitHub
parent d6801975a0
commit 9048efdc8b
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/index.html
View File

@@ -1260,7 +1260,11 @@
<input id="swipes-checkbox" type="checkbox" /> <input id="swipes-checkbox" type="checkbox" />
Swipes Swipes
</label> </label>
<label for="play_message_sound" class="checkbox_label"> <label for="sendOnEnter-checkbox">
<input id="sendOnEnter-checkbox" type="checkbox" />
Send on Enter
</label>
<label for="play_message_sound" class="checkbox_label">
<input id="play_message_sound" type="checkbox" /> <input id="play_message_sound" type="checkbox" />
<audio id="audio_message_sound" src="sounds/message.mp3" hidden></audio> <audio id="audio_message_sound" src="sounds/message.mp3" hidden></audio>
<span> <span>

24
public/script.js
View File

@@ -405,6 +405,7 @@ var message_already_generated = "";
var cycle_count_generation = 0; var cycle_count_generation = 0;
var swipes = false; var swipes = false;
var sendOnEnter = true;
let anchor_order = 0; let anchor_order = 0;
let style_anchor = true; let style_anchor = true;
@@ -878,6 +879,7 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
.replace(/\*\*(.+?)\*\*/g, "<b>$1</b>") .replace(/\*\*(.+?)\*\*/g, "<b>$1</b>")
.replace(/\n/g, "<br/>"); .replace(/\n/g, "<br/>");
} else if (!isSystem) { } else if (!isSystem) {
mes = mes.replace(/```[\s\S]*?```|``[\s\S]*?``|`[\s\S]*?`|(\".+?\")/gm, function(match, p1) { mes = mes.replace(/```[\s\S]*?```|``[\s\S]*?``|`[\s\S]*?`|(\".+?\")/gm, function(match, p1) {
if (p1) { if (p1) {
return "<q>" + p1.replace(/\"/g, "") + "</q>"; return "<q>" + p1.replace(/\"/g, "") + "</q>";
@@ -885,16 +887,23 @@ function messageFormating(mes, ch_name, isSystem, forceAvatar) {
return match; return match;
} }
}); });
mes = converter.makeHtml(mes); mes = converter.makeHtml(mes);
//mes = mes.replace(/{.*}/g, ""); //mes = mes.replace(/{.*}/g, "");
mes = mes.replace(/{{(\*?.+?\*?)}}/g, ""); mes = mes.replace(/{{(\*?.+?\*?)}}/g, "");
mes = mes.replace(/\n/g, "<br/>"); mes = mes.replace(/\n/g, "<br/>");
mes = mes.trim(); mes = mes.trim();
mes = mes.replace(/<code(.*)>[\s\S]*?<\/code>/g, function (match) { mes = mes.replace(/<code(.*)>[\s\S]*?<\/code>/g, function (match) {
return match.replace(/&amp;/g, '&'); return match.replace(/&amp;/g, '&');
}); });
//mes = mes.replace(/(?<!<code>)(\".+?\")(?![^<]*<\/code>)/g, "<q>$1</q>");
} }
if (forceAvatar) { if (forceAvatar) {
@@ -2800,7 +2809,9 @@ async function getSettings(type) {
swipes = !!settings.swipes; //// swipecode swipes = !!settings.swipes; //// swipecode
$('#swipes-checkbox').prop('checked', swipes); /// swipecode $('#swipes-checkbox').prop('checked', swipes); /// swipecode
//console.log('getSettings -- swipes = ' + swipes + '. toggling box'); sendOnEnter = !!settings.sendOnEnter;
$('#sendOnEnter-checkbox').prop('checked', sendOnEnter);
//console.log('getSettings -- swipes = ' + swipes + '. toggling box');
hideSwipeButtons(); hideSwipeButtons();
//console.log('getsettings calling showswipebtns'); //console.log('getsettings calling showswipebtns');
showSwipeButtons(); showSwipeButtons();
@@ -2915,7 +2926,8 @@ async function saveSettings(type) {
active_character: active_character, active_character: active_character,
textgenerationwebui_settings: textgenerationwebui_settings, textgenerationwebui_settings: textgenerationwebui_settings,
swipes: swipes, swipes: swipes,
horde_settings: horde_settings, sendOnEnter: sendOnEnter,
horde_settings: horde_settings,
power_user: power_user, power_user: power_user,
poe_settings: poe_settings, poe_settings: poe_settings,
extension_settings: extension_settings, extension_settings: extension_settings,
@@ -3556,6 +3568,12 @@ $(document).ready(function () {
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#sendOnEnter-checkbox').change(function () {
sendOnEnter = !!$('#sendOnEnter-checkbox').prop('checked');
saveSettingsDebounced();
});
///// SWIPE BUTTON CLICKS /////// ///// SWIPE BUTTON CLICKS ///////
$(document).on('click', '.swipe_right', function () { //when we click swipe right button $(document).on('click', '.swipe_right', function () { //when we click swipe right button
@@ -3847,7 +3865,7 @@ $(document).ready(function () {
}); });
$("#send_textarea").keydown(function (e) { $("#send_textarea").keydown(function (e) {
if (!e.shiftKey && !e.ctrlKey && e.key == "Enter" && is_send_press == false) { if (!e.shiftKey && !e.ctrlKey && e.key == "Enter" && is_send_press == false && !!$('#sendOnEnter-checkbox').prop('checked')) {
is_send_press = true; is_send_press = true;
e.preventDefault(); e.preventDefault();
Generate(); Generate();