rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Group popout "improvements"

This commit is contained in:
Cohee 2023-10-15 19:42:23 +03:00
parent 421cda2ef0
commit 6e6e5f4747
4 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/css/rm-groups.css
View File

@ -226,4 +226,5 @@
.group_member .avatar { .group_member .avatar {
flex-shrink: 0; flex-shrink: 0;
} flex-basis: auto;
}

6
public/index.html
View File

@ -3611,9 +3611,9 @@
<div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div> <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
</div> </div>
<div class="inline-drawer-content"> <div class="inline-drawer-content">
<div name="Current Group Members" class="flex-container flexFlowColumn overflowYAuto flex1"> <div id="currentGroupMembers" name="Current Group Members" class="flex-container flexFlowColumn overflowYAuto flex1">
<div id="rm_group_members_pagination" class="group_pagination"></div> <div id="rm_group_members_pagination" class="rm_group_members_pagination group_pagination"></div>
<div id="rm_group_members" class="overflowYAuto flex-container"></div> <div id="rm_group_members" class="rm_group_members overflowYAuto flex-container"></div>
</div> </div>
</div> </div>
</div> </div>

49
public/scripts/group-chats.js
View File

@ -993,27 +993,29 @@ function printGroupCandidates() {
function printGroupMembers() { function printGroupMembers() {
const storageKey = 'GroupMembers_PerPage'; const storageKey = 'GroupMembers_PerPage';
$("#rm_group_members_pagination").pagination({ $(".rm_group_members_pagination").each(function() {
dataSource: getGroupCharacters({ doFilter: false, onlyMembers: true }), $(this).pagination({
pageRange: 1, dataSource: getGroupCharacters({ doFilter: false, onlyMembers: true }),
position: 'top', pageRange: 1,
showPageNumbers: false, position: 'top',
prevText: '<', showPageNumbers: false,
nextText: '>', prevText: '<',
formatNavigator: PAGINATION_TEMPLATE, nextText: '>',
showNavigator: true, formatNavigator: PAGINATION_TEMPLATE,
showSizeChanger: true, showNavigator: true,
pageSize: Number(localStorage.getItem(storageKey)) || 5, showSizeChanger: true,
sizeChangerOptions: [5, 10, 25, 50, 100, 200], pageSize: Number(localStorage.getItem(storageKey)) || 5,
afterSizeSelectorChange: function (e) { sizeChangerOptions: [5, 10, 25, 50, 100, 200],
localStorage.setItem(storageKey, e.target.value); afterSizeSelectorChange: function (e) {
}, localStorage.setItem(storageKey, e.target.value);
callback: function (data) { },
$("#rm_group_members").empty(); callback: function (data) {
for (const i of data) { $(".rm_group_members").empty();
$("#rm_group_members").append(getGroupCharacterBlock(i.item)); for (const i of data) {
} $(".rm_group_members").append(getGroupCharacterBlock(i.item));
}, }
},
});
}); });
} }
@ -1563,6 +1565,9 @@ function doCurMemberListPopout() {
.append(controlBarHtml) .append(controlBarHtml)
.append(memberListClone) .append(memberListClone)
// Remove pagination from popout
newElement.find('.group_pagination').empty();
$('body').append(newElement); $('body').append(newElement);
loadMovingUIState(); loadMovingUIState();
$("#groupMemberListPopout").fadeIn(250) $("#groupMemberListPopout").fadeIn(250)
@ -1571,6 +1576,8 @@ function doCurMemberListPopout() {
$("#groupMemberListPopout").fadeOut(250, () => { $("#groupMemberListPopout").remove() }) $("#groupMemberListPopout").fadeOut(250, () => { $("#groupMemberListPopout").remove() })
}) })
// Re-add pagination not working in popout
printGroupMembers();
} else { } else {
console.debug('saw existing popout, removing') console.debug('saw existing popout, removing')
$("#groupMemberListPopout").fadeOut(250, () => { $("#groupMemberListPopout").remove() }); $("#groupMemberListPopout").fadeOut(250, () => { $("#groupMemberListPopout").remove() });

7
public/style.css
View File

@ -3474,6 +3474,11 @@ a {
#groupMemberListPopout { #groupMemberListPopout {
padding: 0; padding: 0;
height: 50%;
}
#groupMemberListPopout #currentGroupMembers {
height: 100%;
} }
#groupMemberListPopout #rm_group_members { #groupMemberListPopout #rm_group_members {
@ -3623,4 +3628,4 @@ a {
height: 100vh; height: 100vh;
z-index: 9999; z-index: 9999;
} }
} }