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

Fix make draggable

Browse Source
This commit is contained in:
Cohee
2024-05-24 22:00:21 +03:00
parent 8bcb1ef2db
commit 61e5c32cd2
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
public/scripts/PromptManager.js
View File

@ -6,7 +6,7 @@ import { Message, TokenHandler } from './openai.js';
import { power_user } from './power-user.js'; import { power_user } from './power-user.js';
import { debounce, waitUntilCondition, escapeHtml } from './utils.js'; import { debounce, waitUntilCondition, escapeHtml } from './utils.js';
import { debounce_timeout } from './constants.js'; import { debounce_timeout } from './constants.js';
import { renderTemplateAsync } from './templates.js' import { renderTemplateAsync } from './templates.js';
function debouncePromise(func, delay) { function debouncePromise(func, delay) {
let timeoutId; let timeoutId;
@ -251,7 +251,7 @@ class PromptManager {
this.error = null; this.error = null;
/** Dry-run for generate, must return a promise */ /** Dry-run for generate, must return a promise */
this.tryGenerate = () => { }; this.tryGenerate = async () => { };
/** Called to persist the configuration, must return a promise */ /** Called to persist the configuration, must return a promise */
this.saveServiceSettings = () => { }; this.saveServiceSettings = () => { };
@ -696,21 +696,23 @@ class PromptManager {
if ('character' === this.configuration.promptOrder.strategy && null === this.activeCharacter) return; if ('character' === this.configuration.promptOrder.strategy && null === this.activeCharacter) return;
this.error = null; this.error = null;
waitUntilCondition(() => !is_send_press && !is_group_generating, 1024 * 1024, 100).then(() => { waitUntilCondition(() => !is_send_press && !is_group_generating, 1024 * 1024, 100).then(async () => {
if (true === afterTryGenerate) { if (true === afterTryGenerate) {
// Executed during dry-run for determining context composition // Executed during dry-run for determining context composition
this.profileStart('filling context'); this.profileStart('filling context');
this.tryGenerate().finally(() => { this.tryGenerate().finally(async () => {
this.profileEnd('filling context'); this.profileEnd('filling context');
this.profileStart('render'); this.profileStart('render');
this.renderPromptManager().then(() => this.renderPromptManagerListItems()); await this.renderPromptManager();
await this.renderPromptManagerListItems();
this.makeDraggable(); this.makeDraggable();
this.profileEnd('render'); this.profileEnd('render');
}); });
} else { } else {
// Executed during live communication // Executed during live communication
this.profileStart('render'); this.profileStart('render');
this.renderPromptManager().then(() => this.renderPromptManagerListItems()); await this.renderPromptManager();
await this.renderPromptManagerListItems();
this.makeDraggable(); this.makeDraggable();
this.profileEnd('render'); this.profileEnd('render');
} }
@ -1353,8 +1355,8 @@ class PromptManager {
`; `;
const totalActiveTokens = this.tokenUsage; const totalActiveTokens = this.tokenUsage;
const headerHtml = await renderTemplateAsync('promptManagerHeader', {error: this.error, errorDiv, prefix: this.configuration.prefix, totalActiveTokens}); const headerHtml = await renderTemplateAsync('promptManagerHeader', { error: this.error, errorDiv, prefix: this.configuration.prefix, totalActiveTokens });
promptManagerDiv.insertAdjacentHTML('beforeend', headerHtml); promptManagerDiv.insertAdjacentHTML('beforeend', headerHtml);
this.listElement = promptManagerDiv.querySelector(`#${this.configuration.prefix}prompt_manager_list`); this.listElement = promptManagerDiv.querySelector(`#${this.configuration.prefix}prompt_manager_list`);
@ -1375,7 +1377,7 @@ class PromptManager {
const rangeBlockDiv = promptManagerDiv.querySelector('.range-block'); const rangeBlockDiv = promptManagerDiv.querySelector('.range-block');
const headerDiv = promptManagerDiv.querySelector('.completion_prompt_manager_header'); const headerDiv = promptManagerDiv.querySelector('.completion_prompt_manager_header');
const footerHtml = await renderTemplateAsync('promptManagerFooter', {promptsHtml, prefix: this.configuration.prefix}); const footerHtml = await renderTemplateAsync('promptManagerFooter', { promptsHtml, prefix: this.configuration.prefix });
headerDiv.insertAdjacentHTML('afterend', footerHtml); headerDiv.insertAdjacentHTML('afterend', footerHtml);
rangeBlockDiv.querySelector('#prompt-manager-reset-character').addEventListener('click', this.handleCharacterReset); rangeBlockDiv.querySelector('#prompt-manager-reset-character').addEventListener('click', this.handleCharacterReset);
@ -1386,9 +1388,9 @@ class PromptManager {
footerDiv.querySelector('select').selectedIndex = selectedPromptIndex; footerDiv.querySelector('select').selectedIndex = selectedPromptIndex;
// Add prompt export dialogue and options // Add prompt export dialogue and options
const exportForCharacter = await renderTemplateAsync('promptManagerExportForCharacter'); const exportForCharacter = await renderTemplateAsync('promptManagerExportForCharacter');
let exportPopup = await renderTemplateAsync('promptManagerExportPopup', {isGlobalStrategy: 'global' === this.configuration.promptOrder.strategy, exportForCharacter}); let exportPopup = await renderTemplateAsync('promptManagerExportPopup', { isGlobalStrategy: 'global' === this.configuration.promptOrder.strategy, exportForCharacter });
rangeBlockDiv.insertAdjacentHTML('beforeend', exportPopup); rangeBlockDiv.insertAdjacentHTML('beforeend', exportPopup);
// Destroy previous popper instance if it exists // Destroy previous popper instance if it exists
@ -1429,11 +1431,11 @@ class PromptManager {
promptManagerList.innerHTML = ''; promptManagerList.innerHTML = '';
const { prefix } = this.configuration; const { prefix } = this.configuration;
const that = this; const that = this;
let listItem = await renderTemplateAsync('promptManagerListHeader', {prefix}); let listItem = await renderTemplateAsync('promptManagerListHeader', { prefix });
this.getPromptsForCharacter(this.activeCharacter).forEach(async function(prompt) { this.getPromptsForCharacter(this.activeCharacter).forEach(async function(prompt) {
if (!prompt) return; if (!prompt) return;