Merge pull request #24491 from nextcloud/backport/24376/stable20
[stable20] fix loading mtime of new file in conflict dialog in firefox
This commit is contained in:
commit
02427cd76f
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…
Reference in New Issue