fix loading mtime of new file in conflict dialog in firefox

Signed-off-by: Robin Appelman <[email protected]> Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
nextcloud · Dec 2, 2020 · 1f6e5c6 · 1f6e5c6
1 parent 2a0c0ea
commit 1f6e5c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/core/js/dist/login.js b/core/js/dist/login.js
diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map
diff --git a/core/js/dist/main.js b/core/js/dist/main.js
diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map
diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js
@@ -790,9 +790,9 @@ const Dialogs = {
 			$originalDiv.find('.size').text(OC.Util.humanFileSize(original.size))
 			$originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime))
 			// ie sucks
-			if (replacement.size && replacement.lastModifiedDate) {
+			if (replacement.size && replacement.lastModified) {
 				$replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size))
-				$replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModifiedDate))
+				$replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModified))
 			}
 			var path = original.directory + '/' + original.name
 			var urlSpec = {
@@ -823,9 +823,9 @@ const Dialogs = {
 
 			// set more recent mtime bold
 			// ie sucks
-			if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) {
+			if (replacement.lastModified > original.mtime) {
 				$replacementDiv.find('.mtime').css('font-weight', 'bold')
-			} else if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() < original.mtime) {
+			} else if (replacement.lastModified < original.mtime) {
 				$originalDiv.find('.mtime').css('font-weight', 'bold')
 			} else {
 				// TODO add to same mtime collection?