Skip to content

Commit

Permalink
Merge pull request #785 from nextcloud/backport/783/stable20
Browse files Browse the repository at this point in the history
[stable20] Fix sorting if one of the file name is only composed with number
  • Loading branch information
skjnldsv authored Jun 6, 2021
2 parents 8dde6e0 + 289c655 commit d132efa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions js/photos-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/photos-main.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/utils/fileUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ const sortCompare = function(fileInfo1, fileInfo2, key, asc = true) {

// finally sort by name
return asc
? fileInfo1[key]?.localeCompare(fileInfo2[key], OC.getLanguage()) || 1
: -fileInfo1[key]?.localeCompare(fileInfo2[key], OC.getLanguage()) || -1
? fileInfo1[key]?.toString()?.localeCompare(fileInfo2[key].toString(), OC.getLanguage()) || 1
: -fileInfo1[key]?.toString()?.localeCompare(fileInfo2[key].toString(), OC.getLanguage()) || -1
}

const genFileInfo = function(obj) {
Expand Down

0 comments on commit d132efa

Please sign in to comment.