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