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>
pull/24376/head
Robin Appelman 4 years ago committed by npmbuildbot-nextcloud[bot]
parent dda83950f1
commit e6f1b1033b

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

@ -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?

Loading…
Cancel
Save