fix loading mtime of new file in conflict dialog in firefox

Signed-off-by: Robin Appelman <robin@icewind.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
This commit is contained in:
Robin Appelman 2020-11-25 16:56:06 +01:00 committed by npmbuildbot-nextcloud[bot]
parent 2a0c0ea584
commit 1f6e5c6d8e
5 changed files with 8 additions and 8 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -790,9 +790,9 @@ const Dialogs = {
$originalDiv.find('.size').text(OC.Util.humanFileSize(original.size)) $originalDiv.find('.size').text(OC.Util.humanFileSize(original.size))
$originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime)) $originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime))
// ie sucks // ie sucks
if (replacement.size && replacement.lastModifiedDate) { if (replacement.size && replacement.lastModified) {
$replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size)) $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 path = original.directory + '/' + original.name
var urlSpec = { var urlSpec = {
@ -823,9 +823,9 @@ const Dialogs = {
// set more recent mtime bold // set more recent mtime bold
// ie sucks // ie sucks
if (replacement.lastModifiedDate && replacement.lastModifiedDate.getTime() > original.mtime) { if (replacement.lastModified > original.mtime) {
$replacementDiv.find('.mtime').css('font-weight', 'bold') $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') $originalDiv.find('.mtime').css('font-weight', 'bold')
} else { } else {
// TODO add to same mtime collection? // TODO add to same mtime collection?