Fix replacement dialog

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
pull/20861/head
Roeland Jago Douma 6 years ago committed by npmbuildbot[bot]
parent d730579809
commit 2be21fab9a
  1. 2
      core/js/dist/login.js
  2. 2
      core/js/dist/login.js.map
  3. 2
      core/js/dist/main.js
  4. 2
      core/js/dist/main.js.map
  5. 2
      core/js/dist/maintenance.js
  6. 2
      core/js/dist/maintenance.js.map
  7. 4
      core/src/OC/dialogs.js

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -787,11 +787,11 @@ const Dialogs = {
$conflict.find('.filename').text(original.name)
$originalDiv.find('.size').text(OC.Util.humanFileSize(original.size))
$originalDiv.find('.mtime').text(formatDate(original.mtime))
$originalDiv.find('.mtime').text(OC.Util.formatDate(original.mtime))
// ie sucks
if (replacement.size && replacement.lastModifiedDate) {
$replacementDiv.find('.size').text(OC.Util.humanFileSize(replacement.size))
$replacementDiv.find('.mtime').text(formatDate(replacement.lastModifiedDate))
$replacementDiv.find('.mtime').text(OC.Util.formatDate(replacement.lastModifiedDate))
}
var path = original.directory + '/' + original.name
var urlSpec = {

Loading…
Cancel
Save