Merge pull request #2089 from nextcloud/backport/2088/stable28

[stable28] Fix: Sorting filenames containing numbers
nextcloud · Nov 30, 2023 · 44e3f6d · 44e3f6d
2 parents 65c07dd + 1bc4904
commit 44e3f6d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/js/viewer-main.js b/js/viewer-main.js
diff --git a/js/viewer-main.js.map b/js/viewer-main.js.map
diff --git a/src/utils/fileUtils.ts b/src/utils/fileUtils.ts
@@ -73,8 +73,8 @@ const sortCompare = function(fileInfo1, fileInfo2, key, asc = true) {
 
 	// finally sort by name
 	return asc
-		? fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage())
-		: -fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage())
+		? fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage(), { numeric: true })
+		: -fileInfo1[key].localeCompare(fileInfo2[key], OC.getLanguage(), { numeric: true })
 }
 
 export type FileInfo = object