diff --git a/core/js/dist/login.js b/core/js/dist/login.js index 6c8483d6798b6d733846029f00fc6ef2fe76e0ea..ff04a539d530335d8d169ef7b6eedd1c818dcc50 100644 Binary files a/core/js/dist/login.js and b/core/js/dist/login.js differ diff --git a/core/js/dist/login.js.map b/core/js/dist/login.js.map index 5f2572dedb3780f5072dc53487aac78489fa66c4..ce8feaa1ca2a5efcae41f50949e7071fbe52975b 100644 Binary files a/core/js/dist/login.js.map and b/core/js/dist/login.js.map differ diff --git a/core/js/dist/main.js b/core/js/dist/main.js index 385373d6f4a9e374e8f834a31dfa569d67d0c68a..5691097eab58237fb42c3d4ded025a79ec65b517 100644 Binary files a/core/js/dist/main.js and b/core/js/dist/main.js differ diff --git a/core/js/dist/main.js.map b/core/js/dist/main.js.map index c89a22f187027c6d8e1406e4939b84695ee15273..c6f32434c8029a2c77741f4721f74c099d79a379 100644 Binary files a/core/js/dist/main.js.map and b/core/js/dist/main.js.map differ diff --git a/core/src/OC/dialogs.js b/core/src/OC/dialogs.js index df0794711f1b148e67812345c2020b78284245bd..38b7b42751b225f62303990803a7e375b97003b7 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?