Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

This commit is contained in:
RossAscends
2023-10-10 04:49:37 +09:00
7 changed files with 66 additions and 39 deletions

View File

@@ -48,8 +48,10 @@ function downloadAssetsList(url) {
}
console.debug(DEBUG_PREFIX, "Updated available assets to", availableAssets);
// First extensions, then everything else
const assetTypes = Object.keys(availableAssets).sort((a, b) => (a === 'extension') ? -1 : (b === 'extension') ? 1 : 0);
for (const assetType in availableAssets) {
for (const assetType of assetTypes) {
let assetTypeMenu = $('<div />', { id: "assets_audio_ambient_div", class: "assets-list-div" });
assetTypeMenu.append(`<h3>${assetType}</h3>`)
for (const i in availableAssets[assetType]) {

View File

@@ -13,6 +13,10 @@
padding: 5px;
}
.assets-list-div h3 {
text-transform: capitalize;
}
.assets-list-div i {
display: flex;
flex-direction: row;
@@ -22,10 +26,14 @@
font-style: normal;
}
.assets-list-div i span{
.assets-list-div i span {
margin-left: 10px;
}
.assets-list-div i span:first-of-type {
font-weight: bold;
}
.asset-download-button {
position: relative;
width: 50px;
@@ -34,7 +42,7 @@
outline: none;
border-radius: 2px;
cursor: pointer;
}
}
.asset-download-button:active {
background: #007a63;
@@ -68,11 +76,11 @@
}
@keyframes asset-download-button-loading-spinner {
from {
transform: rotate(0turn);
}
from {
transform: rotate(0turn);
}
to {
transform: rotate(1turn);
}
to {
transform: rotate(1turn);
}
}

View File

@@ -1,7 +1,7 @@
<div id="assets_ui">
<div class="inline-drawer">
<div class="inline-drawer-toggle inline-drawer-header">
<b>Assets</b>
<b>Download Extensions & Assets</b>
<div class="inline-drawer-icon fa-solid fa-circle-chevron-down down"></div>
</div>
<div class="inline-drawer-content">

View File

@@ -1,3 +1,5 @@
export {translate};
import {
callPopup,
eventSource,
@@ -11,7 +13,7 @@ import {
import { extension_settings, getContext } from "../../extensions.js";
import { secret_state, writeSecret } from "../../secrets.js";
const autoModeOptions = {
export const autoModeOptions = {
NONE: 'none',
RESPONSES: 'responses',
INPUT: 'inputs',