mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:
Greta 2020-12-02 16:45:17 +01:00 committed by GitHub
parent e8b284e807 1f6e5c6d8e
commit 02427cd76f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/dist/login.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
core/src/OC/dialogs.js
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?