Merge pull request #2321 from nextcloud/backport/2318/stable29

nextcloud · Aug 7, 2024 · ed28d89 · ed28d89
2 parents d033c17 + d494688
commit ed28d89
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/js/viewer-main.mjs b/js/viewer-main.mjs
@@ -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) {

diff --git a/js/viewer-main.mjs.map b/js/viewer-main.mjs.map
diff --git a/src/utils/fileUtils.ts b/src/utils/fileUtils.ts
@@ -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
@@ -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 })