From 0490ca25b0a92ea86774a5349b3d712525b4aa8f Mon Sep 17 00:00:00 2001 From: RossAscends <124905043+RossAscends@users.noreply.github.com> Date: Mon, 19 Jun 2023 13:23:26 +0900 Subject: [PATCH] char panel buttons into dropdown; sheld width fix --- public/index.html | 39 +++++-- public/script.js | 106 +++++++++++++----- .../scripts/extensions/quick-reply/style.css | 2 + public/style.css | 3 +- 4 files changed, 112 insertions(+), 38 deletions(-) diff --git a/public/index.html b/public/index.html index c75324f69..e088279ec 100644 --- a/public/index.html +++ b/public/index.html @@ -2381,23 +2381,48 @@ avatar
+ +
- + +
-
- - -
+ + + + -
+
 
@@ -3302,4 +3327,4 @@ - + \ No newline at end of file diff --git a/public/script.js b/public/script.js index bc62b0898..8cb473f50 100644 --- a/public/script.js +++ b/public/script.js @@ -273,7 +273,7 @@ let is_mes_reload_avatar = false; let optionsPopper = Popper.createPopper(document.getElementById('options_button'), document.getElementById('options'), { placement: 'top-start' }); -let exportPopper = Popper.createPopper(document.getElementById('export_button'), document.getElementById('export_format_popup'), { +let exportPopper = Popper.createPopper(document.getElementById('char-management-dropdown'), document.getElementById('export_format_popup'), { placement: 'left' }); let rawPromptPopper = Popper.createPopper(document.getElementById('dialogue_popup'), document.getElementById('rawPromptPopup'), { @@ -2776,6 +2776,19 @@ function getMultigenAmount() { return this_amount_gen; } +async function DupeChar() { + const body = { avatar_url: characters[this_chid].avatar }; + const response = await fetch('/dupecharacter', { + method: 'POST', + headers: getRequestHeaders(), + body: JSON.stringify(body), + }); + if (response.ok) { + toastr.success("Character Duplicated"); + getCharacters(); + } +} + function promptItemize(itemizedPrompts, requestedMesId) { console.log('PROMPT ITEMIZE ENTERED'); var incomingMesId = Number(requestedMesId); @@ -6405,15 +6418,15 @@ $(document).ready(function () { $("#form_create").submit(createOrEditCharacter); - $("#delete_button").click(function () { - popup_type = "del_ch"; - callPopup(` -

Delete the character?

- THIS IS PERMANENT!

- THIS WILL ALSO DELETE ALL
- OF THE CHARACTER'S CHAT FILES.

` - ); - }); + /* $("#delete_button").click(function () { + popup_type = "del_ch"; + callPopup(` +

Delete the character?

+ THIS IS PERMANENT!

+ THIS WILL ALSO DELETE ALL
+ OF THE CHARACTER'S CHAT FILES.

` + ); + }); */ $("#rm_info_button").click(function () { $("#rm_info_avatar").html(""); @@ -6460,7 +6473,7 @@ $(document).ready(function () { } }); - $("#renameCharButton").on('click', renameCharacter); + /* $("#renameCharButton").on('click', renameCharacter); */ $(document).on("click", ".renameChatButton", async function () { const old_filenamefull = $(this).closest('.select_chat_block_wrapper').find('.select_chat_block_filename').text(); @@ -6644,7 +6657,7 @@ $(document).ready(function () { if (!isMouseOverButtonOrMenu() && menu.is(':visible')) { hideMenu(); } }); - $('#set_chat_scenario').on('click', setScenarioOverride); + /* $('#set_chat_scenario').on('click', setScenarioOverride); */ ///////////// OPTIMIZED LISTENERS FOR LEFT SIDE OPTIONS POPUP MENU ////////////////////// @@ -7183,10 +7196,10 @@ $(document).ready(function () { importCharacter(file); } }); - $("#export_button").click(function (e) { - $('#export_format_popup').toggle(); - exportPopper.update(); - }); + /* $("#export_button").click(function (e) { + $('#export_format_popup').toggle(); + exportPopper.update(); + }); */ $(document).on('click', '.export_format', async function () { const format = $(this).data('format'); @@ -7266,19 +7279,19 @@ $(document).ready(function () { select_rm_characters(); }); - $("#dupe_button").click(async function () { - - const body = { avatar_url: characters[this_chid].avatar }; - const response = await fetch('/dupecharacter', { - method: 'POST', - headers: getRequestHeaders(), - body: JSON.stringify(body), - }); - if (response.ok) { - toastr.success("Character Duplicated"); - getCharacters(); - } - }); + /* $("#dupe_button").click(async function () { + + const body = { avatar_url: characters[this_chid].avatar }; + const response = await fetch('/dupecharacter', { + method: 'POST', + headers: getRequestHeaders(), + body: JSON.stringify(body), + }); + if (response.ok) { + toastr.success("Character Duplicated"); + getCharacters(); + } + }); */ $(document).on("click", ".select_chat_block, .bookmark_link, .mes_bookmark", async function () { let file_name = $(this).hasClass('mes_bookmark') @@ -7431,7 +7444,7 @@ $(document).ready(function () { $("#world_popup_entries_list").children().find('.up').click() }); $(document).on('click', '.open_alternate_greetings', openAlternateGreetings); - $('#set_character_world').on('click', openCharacterWorldPopup); + /* $('#set_character_world').on('click', openCharacterWorldPopup); */ $(document).keyup(function (e) { if (e.key === "Escape") { @@ -7464,6 +7477,39 @@ $(document).ready(function () { }); }); + $("#char-management-dropdown").on('change', (e) => { + let target = $(e.target.selectedOptions).attr('id'); + switch (target) { + case 'set_character_world': + openCharacterWorldPopup(); + break; + case 'set_chat_scenario': + setScenarioOverride(); + break; + case 'renameCharButton': + renameCharacter(); + break; + case 'dupe_button': + DupeChar(); + break; + case 'export_button': + $('#export_format_popup').toggle(); + exportPopper.update(); + break; + case 'delete_button': + popup_type = "del_ch"; + callPopup(` +

Delete the character?

+ THIS IS PERMANENT!

+ THIS WILL ALSO DELETE ALL
+ OF THE CHARACTER'S CHAT FILES.

` + ); + break; + } + $("#char-management-dropdown").prop('selectedIndex', 0); + }); + + $(document).on('click', '.mes_img_enlarge', enlargeMessageImage); $(document).on('click', '.mes_img_delete', deleteMessageImage); diff --git a/public/scripts/extensions/quick-reply/style.css b/public/scripts/extensions/quick-reply/style.css index 46a80a7a3..04f6ff1df 100644 --- a/public/scripts/extensions/quick-reply/style.css +++ b/public/scripts/extensions/quick-reply/style.css @@ -10,6 +10,8 @@ justify-content: center; width: 100%; display: none; + max-width: 100%; + overflow-x: scroll; } #quickReplies { diff --git a/public/style.css b/public/style.css index d6f910ff0..5a72e4fa3 100644 --- a/public/style.css +++ b/public/style.css @@ -4431,6 +4431,7 @@ body.waifuMode #avatar_zoom_popup { #send_form { border: 1px solid var(--grey30); backdrop-filter: blur(calc(var(--SmartThemeBlurStrength) * 2)); + max-width: 100dvw; } #chat { @@ -4654,4 +4655,4 @@ body.waifuMode #avatar_zoom_popup { #horde_model { height: unset; } -} +} \ No newline at end of file