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

Merge branch 'SillyTavern:staging' into staging

Browse Source
This commit is contained in:
Tony Ribeiro
2023-08-18 17:43:18 +02:00
committed by GitHub
parent 125dc7d596 303f961ee2
commit 6bedc36611
14 changed files with 105 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/scripts/extensions/expressions/style.css
View File

@@ -48,7 +48,7 @@
z-index: 2;
overflow: hidden;
resize: both;
display: flex;
}
img.expression {
@@ -56,7 +56,6 @@ img.expression {
min-height: 100px;
max-height: 90vh;
max-width: 90vh;
width: 100%;
top: 0;
bottom: 0;
padding: 0;
@@ -181,4 +180,4 @@ img.expression.default {
div.expression {
display: none;
}
}
}

5
public/scripts/extensions/regex/index.js
View File

@@ -1,6 +1,6 @@
import { callPopup, eventSource, event_types, getCurrentChatId, reloadCurrentChat, saveSettingsDebounced } from "../../../script.js";
import { callPopup, getCurrentChatId, reloadCurrentChat, saveSettingsDebounced } from "../../../script.js";
import { extension_settings } from "../../extensions.js";
import { uuidv4, waitUntilCondition } from "../../utils.js";
import { getSortableDelay, uuidv4 } from "../../utils.js";
import { regex_placement } from "./engine.js";
async function saveRegexScript(regexScript, existingScriptIndex) {
@@ -236,6 +236,7 @@ jQuery(async () => {
});
$('#saved_regex_scripts').sortable({
delay: getSortableDelay(),
stop: function () {
let newScripts = [];
$('#saved_regex_scripts').children().each(function () {