From e6f1b1033b4d16490d9a2e6ad779883a62cbdc5e Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 25 Nov 2020 16:56:06 +0100 Subject: fix loading mtime of new file in conflict dialog in firefox Signed-off-by: Robin Appelman Signed-off-by: npmbuildbot-nextcloud[bot] --- core/src/OC/dialogs.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'core/src') diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index df0794711f1..38b7b42751b 100644 --- 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? -- cgit v1.2.3