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

Merge pull request #24492 from nextcloud/backport/24376/stable19 

[stable19] fix loading mtime of new file in conflict dialog in firefox
This commit is contained in:
John Molakvoæ 2020-12-03 07:44:33 +01:00 committed by GitHub
parent 253aeb3049 a2300b4968
commit 769f4daece
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 10 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

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

8
core/src/OC/dialogs.js
View File

@ -789,9 +789,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 = {
@ -822,9 +822,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?