rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-01-05 21:46:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-evaluate world info entry - simplified priority sort order

Browse Source 
Changed priority primarySort ternary to check disabled first, then constant, then normal.
This commit is contained in:
Khreed 2024-10-10 10:19:16 -04:00
parent 28861660ef
commit efb63c7f24
1 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
public/scripts/world-info.js
View File

@ -1678,34 +1678,11 @@ export function sortWorldInfoEntries(data, { customSort = null } = {}) {
return aValue - bValue;
};
} else if (sortRule === 'priority') {
// First constant, then normal, then disabled, then by comment.
// First constant, then normal, then disabled.
primarySort = (a, b) => {
// Determine priority based on disable and constant flags
const aPriority = a.disable ? 2 : a.constant ? 0 : 1;
const bPriority = b.disable ? 2 : b.constant ? 0 : 1;
// Compare priorities first
if (aPriority !== bPriority) {
return aPriority - bPriority;
}
// Normalize comments for comparison, handling null/undefined
const commentA = a.comment ? a.comment.toLowerCase() : '';
const commentB = b.comment ? b.comment.toLowerCase() : '';
// Assign constant values for further comparison
const constantA = a.constant ? 0 : 1;
const constantB = b.constant ? 0 : 1;
// If priorities are equal, compare constants
if (aPriority === bPriority) {
if (constantA !== constantB) {
return constantA - constantB;
}
}
// Finally, compare comments alphabetically
return commentA.localeCompare(commentB);
const aValue = a.disable ? 2 : a.constant ? 0 : 1;
const bValue = b.disable ? 2 : b.constant ? 0 : 1;
return aValue - bValue;
};
} else {
primarySort = (a, b) => {