Skip to content

[stable29] Fix: sorting by date and number #2321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skjnldsv merged 1 commit into from
Aug 7, 2024
Merged

[stable29] Fix: sorting by date and number #2321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion js/viewer-main.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23100,13 +23100,18 @@ const sortCompare = function(fileInfo1, fileInfo2, key, asc = true) {
return 1;
}
if (isNumber(fileInfo1[key]) && isNumber(fileInfo2[key])) {
return Number(fileInfo1[key]) - Number(fileInfo2[key]);
const result = Number(fileInfo1[key]) - Number(fileInfo2[key]);
return asc ? result : -result;
}
if (fileInfo1.type === "directory" && fileInfo2.type !== "directory") {
return -1;
} else if (fileInfo1.type !== "directory" && fileInfo2.type === "directory") {
return 1;
}
if (key === "lastmod") {
const result = new Date(fileInfo1[key]).getTime() - new Date(fileInfo2[key]).getTime();
return asc ? -result : result;
}
return asc ? fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage(), { numeric: true }) : -fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage(), { numeric: true });
};
const genFileInfo = function(obj) {
Expand Down
2 changes: 1 addition & 1 deletion js/viewer-main.mjs.map
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions src/utils/fileUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ const sortCompare = function(fileInfo1, fileInfo2, key, asc = true) {

// if this is a number, let's sort by integer
if (isNumber(fileInfo1[key]) && isNumber(fileInfo2[key])) {
return Number(fileInfo1[key]) - Number(fileInfo2[key])
const result = Number(fileInfo1[key]) - Number(fileInfo2[key])
return asc ? result : -result
}

// else we sort by string, so let's sort directories first
Expand All @@ -70,7 +71,11 @@ const sortCompare = function(fileInfo1, fileInfo2, key, asc = true) {
} else if (fileInfo1.type !== 'directory' && fileInfo2.type === 'directory') {
return 1
}

// sort by date if key is lastmod
if (key === 'lastmod') {
const result = new Date(fileInfo1[key]).getTime() - new Date(fileInfo2[key]).getTime()
return asc ? -result : result
}
// finally sort by name
return asc
? fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage(), { numeric: true })
Expand Down