diff options
| author | Robin Appelman <robin@icewind.nl> | 2020-11-25 16:56:06 +0100 |
|---|---|---|
| committer | npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com> | 2020-12-01 21:45:00 +0000 |
| commit | e6f1b1033b4d16490d9a2e6ad779883a62cbdc5e (patch) | |
| tree | 12db4eab5007e44785d489eb2e01374b4aefd246 /core/src/OC | |
| parent | dda83950f186ef1865fca88001cb7159a455087b (diff) | |
| download | nextcloud-server-e6f1b1033b4d16490d9a2e6ad779883a62cbdc5e.tar.gz nextcloud-server-e6f1b1033b4d16490d9a2e6ad779883a62cbdc5e.zip | |
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>
Diffstat (limited to 'core/src/OC')
| -rw-r--r-- | core/src/OC/dialogs.js | 8 |
1 files changed, 4 insertions, 4 deletions
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? |