On-fly switch of Markdown renderers

This commit is contained in:
SillyLossy
2023-04-30 18:07:08 +03:00
parent 2d624f90a6
commit a69750e36f
6 changed files with 92 additions and 28 deletions

View File

@@ -122,6 +122,10 @@ function isMobile() {
}
function shouldSendOnEnter() {
if (!power_user) {
return false;
}
switch (power_user.send_on_enter) {
case send_on_enter_options.DISABLED:
return false;
@@ -708,10 +712,9 @@ $("document").ready(function () {
//Additional hotkeys CTRL+ENTER and CTRL+UPARROW
function processHotkeys(event) {
const sendOnEnter = shouldSendOnEnter();
//Enter to send when send_textarea in focus
if ($(':focus').attr('id') === 'send_textarea') {
const sendOnEnter = shouldSendOnEnter();
if (!event.shiftKey && !event.ctrlKey && event.key == "Enter" && is_send_press == false && sendOnEnter) {
event.preventDefault();
Generate();

View File

@@ -115,7 +115,7 @@ async function regenerateGroup() {
generateGroupWrapper();
}
async function getGroupChat(id) {
export async function getGroupChat(id) {
const response = await fetch("/getgroupchat", {
method: "POST",
headers: {

View File

@@ -5,6 +5,8 @@ import {
callPopup,
token,
getStatus,
reloadMarkdownProcessor,
reloadCurrentChat,
} from "../script.js";
export {
@@ -97,6 +99,7 @@ let power_user = {
auto_scroll_chat_to_bottom: true,
auto_fix_generated_markdown: true,
send_on_enter: send_on_enter_options.AUTO,
render_formulas: false,
};
let themes = [];
@@ -117,7 +120,6 @@ const storage_keys = {
shadow_color: "TavernAI_shadow_color",
shadow_width: "TavernAI_shadow_width",
waifuMode: "TavernAI_waifuMode",
movingUI: "TavernAI_movingUI",
noShadows: "TavernAI_noShadows",
@@ -358,6 +360,7 @@ function loadPowerUserSettings(settings, data) {
$("#always-force-name2-checkbox").prop("checked", power_user.always_force_name2);
$("#disable-examples-formatting-checkbox").prop("checked", power_user.disable_examples_formatting);
$('#disable-start-formatting-checkbox').prop("checked", power_user.disable_start_formatting);
$('#render_formulas').prop("checked", power_user.render_formulas);
$("#custom_chat_separator").val(power_user.custom_chat_separator);
$("#fast_ui_mode").prop("checked", power_user.fast_ui_mode);
$("#waifuMode").prop("checked", power_user.waifuMode);
@@ -399,6 +402,7 @@ function loadPowerUserSettings(settings, data) {
$(`#character_sort_order option[data-order="${power_user.sort_order}"][data-field="${power_user.sort_field}"]`).prop("selected", true);
sortCharactersList();
reloadMarkdownProcessor(power_user.render_formulas);
}
function sortCharactersList(selector = '.character_select') {
@@ -727,6 +731,13 @@ $(document).ready(() => {
saveSettingsDebounced();
});
$("#render_formulas").on("input", function () {
power_user.render_formulas = !!$(this).prop('checked');
reloadMarkdownProcessor(power_user.render_formulas);
reloadCurrentChat();
saveSettingsDebounced();
})
$(window).on('focus', function () {
browser_has_focus = true;
});