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

Up and down

Browse Source
This commit is contained in:
SillyLossy
2023-03-28 16:06:31 +03:00
parent 2836b93463
commit 322f02dec3
3 changed files with 118 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

147
public/script.js
View File

@ -1758,11 +1758,7 @@ async function Generate(type, automatic_trigger, force_name2) {//encode("dsfs").
}
console.log('/savechat called by /Generate');
if (selected_group) {
saveGroupChat(selected_group);
} else {
saveChat();
}
saveChatConditional();
//let final_message_length = encode(JSON.stringify(getMessage)).length;
//console.log('AI Response: +'+getMessage+ '('+final_message_length+' tokens)');
@ -2374,11 +2370,7 @@ function messageEditDone(div) {
mesBlock.find(".mes_bias").append(messageFormating(bias));
appendImageToMessage(chat[this_edit_mes_id], div.closest(".mes"));
this_edit_mes_id = undefined;
if (selected_group) {
saveGroupChat(selected_group);
} else {
saveChat();
}
saveChatConditional();
}
async function getAllCharaChats() {
@ -2817,6 +2809,46 @@ function hideSwipeButtons() {
$("#chat").children().filter('[mesid="' + (count_view_mes - 1) + '"]').children('.swipe_left').css('display', 'none');
}
function saveChatConditional() {
if (selected_group) {
saveGroupChat(selected_group);
}
else {
saveChat();
}
}
function updateViewMessageIds() {
$('#chat').find(".mes").each(function (index, element) {
$(element).attr("mesid", index);
});
$('#chat .mes').removeClass('last_mes');
$('#chat .mes').last().addClass('last_mes');
updateEditArrowClasses();
}
function updateEditArrowClasses() {
$("#chat .mes .mes_edit_up").removeClass("disabled");
$("#chat .mes .mes_edit_down").removeClass("disabled");
if (this_edit_mes_id !== undefined) {
const down = $(`#chat .mes[mesid="${this_edit_mes_id}"] .mes_edit_down`);
const up = $(`#chat .mes[mesid="${this_edit_mes_id}"] .mes_edit_up`);
const lastId = Number($("#chat .mes").last().attr("mesid"));
const firstId = Number($("#chat .mes").first().attr("mesid"));
if (lastId == Number(this_edit_mes_id)) {
down.addClass("disabled");
}
if (firstId == Number(this_edit_mes_id)) {
up.addClass("disabled");
}
}
}
window["TavernAI"].getContext = function () {
return {
chat: chat,
@ -2952,11 +2984,7 @@ $(document).ready(function () {
Generate('swipe');
} else {
if (parseInt(chat[chat.length - 1]['swipe_id']) !== chat[chat.length - 1]['swipes'].length) {
if (selected_group) {
saveGroupChat(selected_group);
} else {
saveChat();
}
saveChatConditional();
}
}
}
@ -3047,11 +3075,7 @@ $(document).ready(function () {
easing: animation_rm_easing,
queue: false,
complete: function () {
if (selected_group) {
saveGroupChat(selected_group);
} else {
saveChat();
}
saveChatConditional();
}
});
}
@ -3790,11 +3814,7 @@ $(document).ready(function () {
$(".mes[mesid='" + this_del_mes + "']").remove();
chat.length = this_del_mes;
count_view_mes = this_del_mes;
if (selected_group) {
saveGroupChat(selected_group);
} else {
saveChat();
}
saveChatConditional();
var $textchat = $("#chat");
$textchat.scrollTop($textchat[0].scrollHeight);
}
@ -4017,6 +4037,8 @@ $(document).ready(function () {
if (this_edit_mes_id == count_view_mes - 1) {
$("#chat").scrollTop(chatScrollPosition);
}
updateEditArrowClasses();
}
});
$(document).on("click", ".mes_edit_cancel", function () {
@ -4033,6 +4055,64 @@ $(document).ready(function () {
this_edit_mes_id = undefined;
});
$(document).on("click", ".mes_edit_up", function() {
if (this_edit_mes_id <= 0) {
return;
}
hideSwipeButtons();
const targetId = Number(this_edit_mes_id) - 1;
const target = $(`#chat .mes[mesid="${targetId}"]`);
const root = $(this).closest('.mes');
if (root.length === 0 || target.length === 0) {
return;
}
root.insertBefore(target);
target.attr("mesid", this_edit_mes_id);
root.attr("mesid", targetId);
const temp = chat[targetId];
chat[targetId] = chat[this_edit_mes_id];
chat[this_edit_mes_id] = temp;
this_edit_mes_id = targetId;
updateViewMessageIds();
saveChatConditional();
showSwipeButtons();
});
$(document).on("click", ".mes_edit_down", function () {
if (this_edit_mes_id >= chat.length - 1) {
return;
}
hideSwipeButtons();
const targetId = Number(this_edit_mes_id) + 1;
const target = $(`#chat .mes[mesid="${targetId}"]`);
const root = $(this).closest('.mes');
if (root.length === 0 || target.length === 0) {
return;
}
root.insertAfter(target);
target.attr("mesid", this_edit_mes_id);
root.attr("mesid", targetId);
const temp = chat[targetId];
chat[targetId] = chat[this_edit_mes_id];
chat[this_edit_mes_id] = temp;
this_edit_mes_id = targetId;
updateViewMessageIds();
saveChatConditional();
showSwipeButtons();
});
$(document).on("click", ".mes_edit_copy", function () {
if (!confirm('Create a copy of this message?')) {
return;
@ -4300,20 +4380,3 @@ $(document).ready(function () {
$(this).closest('.inline-drawer').find('.inline-drawer-content').slideToggle();
});
})
function saveChatConditional() {
if (selected_group) {
saveGroupChat();
}
else {
saveChat();
}
}
function updateViewMessageIds() {
$('#chat').find(".mes").each(function (index, element) {
$(element).attr("mesid", index);
});
$('#chat .mes').removeClass('last_mes');
$('#chat .mes').last().addClass('last_mes');
}

9
public/scripts/extensions/floating-prompt/index.js
View File

@ -19,7 +19,14 @@ function onExtensionFloatingIntervalInput() {
}
function onExtensionFloatingDepthInput() {
promptInsertionDepth = Number($(this).val());
let value = Number($(this).val());
if (promptInsertionDepth < 0) {
value = Math.abs(value);
$(this).val(value);
}
promptInsertionDepth = value;
saveSettings();
}

5
public/style.css
View File

@ -708,6 +708,11 @@ img[src*="user-slash-solid.svg"] {
filter: invert(1) brightness(75%);
}
.menu_button.disabled {
filter: brightness(50%);
cursor: not-allowed;
}
.svg_icon {
filter: invert(1);
}