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 'dev' of http://github.com/cohee1207/SillyTavern into dev

Browse Source
This commit is contained in:
Cohee1207
2023-05-06 15:30:21 +03:00
parent 7f718e09be f1f150e5d1
commit eba26016da
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/utils.js
View File

@@ -161,4 +161,18 @@ export function restoreCaretPosition(element, position) {
const selection = window.getSelection();
selection.removeAllRanges();
selection.addRange(range);
}
export async function resetScrollHeight(element) {
element.style.height = '';
element.style.height = (element.scrollHeight) + 3 + 'px';
}
export async function initScrollHeight(element) {
await delay(1);
const height = Number($(element).prop("scrollHeight") + 3);
console.log(`init height to ${height}`);
//console.log(element.style.height);
$(element).css("height", "");
$(element).css("height", `${height}px`);
}

25
public/scripts/world-info.js
View File

@@ -1,5 +1,5 @@
import { saveSettings, callPopup, substituteParams, getTokenCount, getRequestHeaders } from "../script.js";
import { download, debounce, delay } from "./utils.js";
import { download, debounce, delay, initScrollHeight, resetScrollHeight } from "./utils.js";
export {
world_info,
@@ -234,7 +234,16 @@ function appendWorldEntry(entry) {
const keysecondary = $(this)
.closest(".world_entry")
.find(".keysecondary");
const keyPrimary = $(this)
.closest(".world_entry")
.find(".key");
const keyPrimaryHeight = $(keyPrimary).css('height');
keysecondary.css('height', keyPrimaryHeight) + 'px';
value ? keysecondary.show() : keysecondary.hide();
});
selectiveInput.prop("checked", entry.selective).trigger("input");
selectiveInput.siblings(".checkbox_fancy").click(function () {
@@ -319,20 +328,6 @@ function appendWorldEntry(entry) {
return template;
}
async function resetScrollHeight(element) {
element.style.height = '';
element.style.height = (element.scrollHeight) + 3 + 'px';
}
async function initScrollHeight(element) {
await delay(1);
const height = Number($(element).prop("scrollHeight") + 3);
console.log(height);
//console.log(element.style.height);
$(element).css("height", "");
$(element).css("height", `${height}px`);
}
async function deleteWorldInfoEntry(uid) {
if (!world_info_data || !("entries" in world_info_data)) {
return;