Fix replacement dialog

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
This commit is contained in:
Roeland Jago Douma 2020-05-07 16:52:27 +02:00 committed by backportbot[bot]
parent 3b0e581dec
commit 3365ab787a
7 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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -787,11 +787,11 @@ const Dialogs = {
$conflict.find('.filename').text(original.name)
$originalDiv.find('.size').text(OC.Util.humanFileSize(original.size))
$originalDiv.find('.mtime').text(formatDate(original.mtime))
$originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime))
// ie sucks
if (replacement.size && replacement.lastModifiedDate) {
$replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size))
$replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate))
$replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModifiedDate))
}
var path = original.directory + '/' + original.name
var urlSpec = {